Skip to content
Snippets Groups Projects
Commit b3f10c73 authored by Thomas Guillem's avatar Thomas Guillem
Browse files

buildsytem: use last libvlcjni build script

vlc sources are now located in libvlcjni folder, and not on vlc-android.
Adapt the compile-medialibrary.sh with the new libvlcjni changes.
parent 3a1690c8
No related branches found
No related tags found
1 merge request!1757buildsytem: use last libvlcjni build script
Pipeline #360861 passed with stage
in 38 minutes and 19 seconds
......@@ -26,6 +26,7 @@ while [ $# -gt 0 ]; do
shift
done
SRC_DIR=$PWD
AVLC_SOURCED=1 . libvlcjni/buildsystem/compile-libvlc.sh
################
......@@ -170,8 +171,8 @@ avlc_checkfail "medialibrary: build failed"
cd ${SRC_DIR}
MEDIALIBRARY_LDLIBS="-L$SRC_DIR/libvlcjni/libvlc/jni/libs/${ANDROID_ABI}/ -lvlc \
-L$SRC_DIR/vlc/contrib/$TARGET_TUPLE/lib -ljpeg \
MEDIALIBRARY_LDLIBS="-L$LIBVLCJNI_SRC_DIR/libvlc/jni/libs/${ANDROID_ABI}/ -lvlc \
-L$LIBVLCJNI_SRC_DIR/vlc/contrib/$TARGET_TUPLE/lib -ljpeg \
-L${NDK_LIB_DIR} -lc++abi"
$NDK_BUILD -C medialibrary \
......
......@@ -259,9 +259,9 @@ fi
if [ "$FORCE_VLC_4" = 1 ]; then
LIBVLCJNI_TESTED_HASH=250488825f41c0a25765471f8872ebe3b39c945d
LIBVLCJNI_TESTED_HASH=e3516743837e9e255c4e531bc5262b1f78b43d1a
else
LIBVLCJNI_TESTED_HASH=599329e36e952d41dfb9ff2ec56ee9854171f6e0
LIBVLCJNI_TESTED_HASH=7d377a83e7287eb93070d354ecad30e8c653dc79
fi
LIBVLCJNI_REPOSITORY=https://code.videolan.org/videolan/libvlcjni
......@@ -298,7 +298,7 @@ if [ -z "$VLC_SRC_DIR" ]; then
get_vlc_args="${get_vlc_args} --reset"
fi
${VLC_LIBJNI_PATH}/buildsystem/get-vlc.sh ${get_vlc_args}
(cd ${VLC_LIBJNI_PATH} && ./buildsystem/get-vlc.sh ${get_vlc_args})
fi
# Always clone VLC when using --init since we'll need to package some files
......
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