[Android] [PATCH] Fix chromeOS build
Thomas Guillem
thomas at gllm.fr
Wed Feb 18 17:11:55 CET 2015
Add hack to deactivate eventfd, and build chrome in a separate folder.
---
compile-libvlc.sh | 14 +++++++++++++-
compile.sh | 3 +++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 85407a1..efe62f0 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,11 @@ cd ../../
# BUILD DIRECTORY #
###################
-VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
+if [ "${CHROME_OS}" = "1" ];then
+ VLC_BUILD_DIR=build-chrome-${TARGET_TUPLE}
+else
+ VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
+fi
mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
#############
@@ -528,6 +535,11 @@ if [ ${ANDROID_API} = "android-21" ] ; then
# doesn't have any shm functions and/or symbols. */
config_undef HAVE_SYS_SHM_H
fi
+if [ "${CHROME_OS}" = "1" ];then
+ # no eventfd for Chrome OS
+ config_undef HAVE_EVENTFD
+ config_undef HAVE_SYS_EVENTFD_H
+fi
# END OF ANDROID NDK FIXUP
############
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
--
2.1.3
More information about the Android
mailing list