[Android] Fix chromeOS build
Thomas Guillem
git at videolan.org
Wed Feb 18 17:35:23 CET 2015
vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Feb 18 17:11:18 2015 +0100| [f5f266edd0831d0f8942071e1d95e24774dd8403] | committer: Thomas Guillem
Fix chromeOS build
Add hack to deactivate eventfd, and build chrome in a separate folder.
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=f5f266edd0831d0f8942071e1d95e24774dd8403
---
compile-libvlc.sh | 11 ++++++++++-
compile.sh | 3 +++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 85407a1..362e471 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -28,6 +28,9 @@ while [ $# -gt 0 ]; do
ANDROID_ABI=$2
shift
;;
+ -c)
+ CHROME_OS=1
+ ;;
release|--release)
RELEASE=1
;;
@@ -471,7 +474,13 @@ cd ../../
# BUILD DIRECTORY #
###################
-VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
+if [ "${CHROME_OS}" = "1" ];then
+ VLC_BUILD_DIR=build-chrome-${TARGET_TUPLE}
+ export ac_cv_func_eventfd=no
+ export ac_cv_header_sys_eventfd_h=no
+else
+ VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
+fi
mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
#############
diff --git a/compile.sh b/compile.sh
index e8a973e..0ce9e4f 100755
--- a/compile.sh
+++ b/compile.sh
@@ -158,6 +158,9 @@ OPTS="-a ${ANDROID_ABI}"
if [ "$RELEASE" = 1 ]; then
OPTS="$OPTS release"
fi
+if [ "$CHROME_OS" = 1 ]; then
+ OPTS="$OPTS -c"
+fi
./compile-libvlc.sh $OPTS
More information about the Android
mailing list