[Android] Buildsystem: fix ml build after vlc move
Duncan McNamara
git at videolan.org
Thu Sep 7 08:21:01 UTC 2023
vlc-android | branch: master | Duncan McNamara <dcn.mcnamara at gmail.com> | Mon Jul 24 17:38:57 2023 +0200| [5f3548559e435273c64807e03b0bb3f8bd03a91c] | committer: Nicolas Pomepuy
Buildsystem: fix ml build after vlc move
> https://code.videolan.org/videolan/vlc-android/commit/5f3548559e435273c64807e03b0bb3f8bd03a91c
---
buildsystem/compile-medialibrary.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 57b83ef895..b2b2694151 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -143,15 +143,15 @@ if [ "$RELEASE" = "1" ]; then
fi
if [ ! -d "build-android-$ANDROID_ABI/" -o ! -f "build-android-$ANDROID_ABI/build.ninja" ]; then
- PKG_CONFIG_LIBDIR="$SRC_DIR/vlc/build-android-${TARGET_TUPLE}/install/lib/pkgconfig" \
- PKG_CONFIG_PATH="$SRC_DIR/medialibrary/prefix/${TARGET_TUPLE}/lib/pkgconfig:$SRC_DIR/vlc/contrib/$TARGET_TUPLE/lib/pkgconfig/" \
+ PKG_CONFIG_LIBDIR="$LIBVLCJNI_SRC_DIR/vlc/build-android-${TARGET_TUPLE}/install/lib/pkgconfig" \
+ PKG_CONFIG_PATH="$SRC_DIR/medialibrary/prefix/${TARGET_TUPLE}/lib/pkgconfig:$LIBVLCJNI_SRC_DIR/vlc/contrib/$TARGET_TUPLE/lib/pkgconfig/" \
meson \
-Ddebug=true \
-Doptimization=${MEDIALIBRARY_OPTIMIZATION} \
-Db_ndebug=${MEDIALIBRARY_NDEBUG} \
-Ddefault_library=static \
--cross-file ${SRC_DIR}/buildsystem/crossfiles/${ANDROID_ABI}-ndk${REL}.crossfile \
- -Dlibjpeg_prefix="$SRC_DIR/vlc/contrib/$TARGET_TUPLE/" \
+ -Dlibjpeg_prefix="$LIBVLCJNI_SRC_DIR/vlc/contrib/$TARGET_TUPLE/" \
-Dtests=disabled \
-Dforce_attachment_api=true \
build-android-${ANDROID_ABI}
More information about the Android
mailing list