[Android] compile.sh: Inline compile function

Hugo Beauzée-Luyssen git at videolan.org
Thu Jan 6 13:11:10 UTC 2022


vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Nov 26 16:34:18 2021 +0100| [4bdc2f5a070dbfb17b10249c36a9d44ddaa6bece] | committer: Nicolas Pomepuy

compile.sh: Inline compile function

It's now invoked only once, just below its declaration

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

 buildsystem/compile.sh | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 9cade0609..6b47b7fec 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -326,25 +326,23 @@ fi
 # Make VLC #
 ############
 diagnostic "Configuring"
-compile() {
-    # Build LibVLC if asked for it, or needed by medialibrary
-    OUT_DBG_DIR=.dbg/${ANDROID_ABI}
-    mkdir -p $OUT_DBG_DIR
 
-    if [ "$BUILD_MEDIALIB" != 1 -o ! -d "libvlc/jni/libs/" ]; then
-        AVLC_SOURCED=1 . buildsystem/compile-libvlc.sh
-        avlc_build
+# Build LibVLC if asked for it, or needed by medialibrary
+OUT_DBG_DIR=.dbg/${ANDROID_ABI}
+mkdir -p $OUT_DBG_DIR
 
-        cp -a ./libvlc/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
-    fi
+if [ "$BUILD_MEDIALIB" != 1 -o ! -d "libvlc/jni/libs/" ]; then
+    AVLC_SOURCED=1 . buildsystem/compile-libvlc.sh
+    avlc_build
 
-    if [ "$NO_ML" != 1 ]; then
-        ANDROID_ABI=$ANDROID_ABI RELEASE=$RELEASE buildsystem/compile-medialibrary.sh
-        cp -a medialibrary/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
-    fi
-}
+    cp -a ./libvlc/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
+fi
+
+if [ "$NO_ML" != 1 ]; then
+    ANDROID_ABI=$ANDROID_ABI RELEASE=$RELEASE buildsystem/compile-medialibrary.sh
+    cp -a medialibrary/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
+fi
 
-compile
 GRADLE_VLC_SRC_DIRS="$VLC_OUT_PATH/libs"
 
 ##################



More information about the Android mailing list