[Android] Always build native from cli

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Jan 22 09:16:38 2019 +0100| [b0a8c9afa1021b2dbe3cc65f93b0994aeed9a953] | committer: Geoffrey Métais

Always build native from cli

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

 compile.sh | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/compile.sh b/compile.sh
index 22e1fecab..6a62f66c0 100755
--- a/compile.sh
+++ b/compile.sh
@@ -290,28 +290,26 @@ compile() {
         ./compile-medialibrary.sh $OPTS
     fi
 }
-if [ "$BUILD_MEDIALIB" = 1 -o "$BUILD_LIBVLC" = 1 -o "$RELEASE" != 1 ]; then
-    if [ "$ANDROID_ABI" = "all" ]; then
-        if [ -d tmp ]; then
-            rm -rf tmp
-        fi
-        mkdir tmp
-        LIB_DIR="libvlc"
-        if [ "$NO_ML" != 1 ]; then
-            LIB_DIR="medialibrary"
-        fi
-        compile armeabi-v7a
-        cp -r $LIB_DIR/jni/libs/armeabi-v7a tmp
-        compile arm64-v8a
-        cp -r $LIB_DIR/jni/libs/arm64-v8a tmp
-        compile x86
-        cp -r $LIB_DIR/jni/libs/x86 tmp
-        compile x86_64
-        mv tmp/* $LIB_DIR/jni/libs
+if [ "$ANDROID_ABI" = "all" ]; then
+    if [ -d tmp ]; then
         rm -rf tmp
-    else
-        compile $ANDROID_ABI
     fi
+    mkdir tmp
+    LIB_DIR="libvlc"
+    if [ "$NO_ML" != 1 ]; then
+        LIB_DIR="medialibrary"
+    fi
+    compile armeabi-v7a
+    cp -r $LIB_DIR/jni/libs/armeabi-v7a tmp
+    compile arm64-v8a
+    cp -r $LIB_DIR/jni/libs/arm64-v8a tmp
+    compile x86
+    cp -r $LIB_DIR/jni/libs/x86 tmp
+    compile x86_64
+    mv tmp/* $LIB_DIR/jni/libs
+    rm -rf tmp
+else
+    compile $ANDROID_ABI
 fi
 
 ##################