[Android] build: remove chrome support

[Thomas Guillem]

vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon May 13 14:04:32 2019 +0200| [4b8fac7dc9ea6f50e76009c882b207b95a407ada] | committer: Thomas Guillem

build: remove chrome support

ChromeOS use standard build now.

> https://code.videolan.org/videolan/vlc-android/commit/4b8fac7dc9ea6f50e76009c882b207b95a407ada
---

 compile-libvlc.sh | 16 +---------------
 compile.sh        | 17 -----------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 6fda72092..12df7c625 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -28,9 +28,6 @@ while [ $# -gt 0 ]; do
             ANDROID_ABI=$2
             shift
             ;;
-        -c)
-            CHROME_OS=1
-            ;;
         release|--release)
             RELEASE=1
             ;;
@@ -319,11 +316,7 @@ cd ../../
 # BUILD DIRECTORY #
 ###################
 
-if [ "${CHROME_OS}" = "1" ];then
-    VLC_BUILD_DIR=build-chrome-${TARGET_TUPLE}
-else
-    VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
-fi
+VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
 VLC_BUILD_DIR=`realpath ${VLC_BUILD_DIR}`
 mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
 
@@ -331,13 +324,6 @@ mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
 # CONFIGURE #
 #############
 
-if [ "${CHROME_OS}" = "1" ];then
-    # chrome OS doesn't have eventfd
-    export ac_cv_func_eventfd=no
-    export ac_cv_header_sys_eventfd_h=no
-    export ac_cv_func_pipe2=no
-fi
-
 if [ ${ANDROID_API} -lt "26" ]; then
     # android APIs < 26 have empty sys/shm.h headers that triggers shm detection but it
     # doesn't have any shm functions and/or symbols. */
diff --git a/compile.sh b/compile.sh
index 4180e8ba8..c28822ff2 100755
--- a/compile.sh
+++ b/compile.sh
@@ -268,9 +268,6 @@ compile() {
     if [ "$RELEASE" = 1 ]; then
         OPTS="$OPTS release"
     fi
-    if [ "$CHROME_OS" = 1 ]; then
-        OPTS="$OPTS -c"
-    fi
 
     # Build LibVLC if asked for it, or needed by medialibrary
     if [ "$BUILD_MEDIALIB" != 1 -o ! -d "libvlc/jni/libs/$1" ]; then
@@ -315,14 +312,12 @@ fi
 if [ "$BUILD_LIBVLC" = 1 ];then
     GRADLE_ABI=$GRADLE_ABI ./gradlew -p libvlc assemble${BUILDTYPE}
     RUN=0
-    CHROME_OS=0
     if [ "$PUBLISH" = 1 ];then
         GRADLE_ABI=$GRADLE_ABI ./gradlew -p libvlc install bintrayUpload
     fi
 elif [ "$BUILD_MEDIALIB" = 1 ]; then
     GRADLE_ABI=$GRADLE_ABI ./gradlew -p medialibrary assemble${BUILDTYPE}
     RUN=0
-    CHROME_OS=0
     if [ "$PUBLISH" = 1 ];then
         GRADLE_ABI=$GRADLE_ABI ./gradlew -p medialibrary install bintrayUpload
     fi
@@ -348,15 +343,3 @@ if [ "$RUN" = 1 ]; then
         adb shell am start -n org.videolan.vlc.debug/org.videolan.vlc.StartActivity
     fi
 fi
-
-#########################
-# Chrome OS repackaging #
-#########################
-# You need to run the armv7 version first, then relaunch this script for x86
-if [ "$CHROME_OS" = 1 -a "$ANDROID_ABI" = "x86" ]; then
-    unzip -o vlc-android/build/outputs/apk/VLC-Android-CHROME-*-ARMv7.apk lib/armeabi-v7a/libvlcjni.so
-    zip -rv vlc-android/build/outputs/apk/VLC-Android-CHROME-*-x86.apk lib/armeabi-v7a/libvlcjni.so
-    rm -rf lib/
-    apk_to_crx.py --zip vlc-android/build/outputs/apk/VLC-Android-CHROME-*-x86.apk --metadata vlc-android/flavors/chrome/VLC-Android-CHROME.crx.json
-    mv vlc-android/build/outputs/apk/VLC-Android-CHROME-*-x86.zip vlc-android/build/outputs/apk/VLC-Android-CHROME-ALL.zip
-fi