Skip to content
Snippets Groups Projects
Commit 4bdc2f5a authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen Committed by Nicolas Pomepuy
Browse files

compile.sh: Inline compile function

It's now invoked only once, just below its declaration
parent da016372
No related branches found
No related tags found
1 merge request!1177CI: Parallelize release libs jobs
Pipeline #176632 passed with stage
in 17 minutes and 34 seconds
......@@ -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"
##################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment