[Android] buildsystem: use a variable for the medialibrary install prefix
Steve Lhomme
git at videolan.org
Tue Jun 24 10:32:39 UTC 2025
vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jun 19 09:53:44 2025 +0200| [5fd510028da293ddf4beac79e2f35cc4ac8a1fa2] | committer: Steve Lhomme
buildsystem: use a variable for the medialibrary install prefix
> https://code.videolan.org/videolan/vlc-android/commit/5fd510028da293ddf4beac79e2f35cc4ac8a1fa2
---
buildsystem/compile-medialibrary.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index a7ab889df8..7491244d14 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -41,6 +41,8 @@ if [ ! -d "${SRC_DIR}/medialibrary" ]; then
mkdir "${SRC_DIR}/medialibrary"
fi
+MEDIALIBRARY_PREFIX="${SRC_DIR}/medialibrary/prefix/${TARGET_TUPLE}"
+
##########
# SQLITE #
##########
@@ -73,7 +75,7 @@ cd "build-$ANDROID_ABI";
if [ ! -e ./config.status ] || [ "$RELEASE" = "1" ]; then
../configure \
--host=$TARGET_TUPLE \
- --prefix=${SRC_DIR}/medialibrary/prefix/${TARGET_TUPLE} \
+ --prefix="${MEDIALIBRARY_PREFIX}" \
--disable-shared \
CFLAGS="${VLC_CFLAGS}" \
CXXFLAGS="${VLC_CFLAGS} ${VLC_CXXFLAGS}" \
@@ -144,7 +146,7 @@ fi
if [ ! -d "build-android-$ANDROID_ABI/" ] || [ ! -f "build-android-$ANDROID_ABI/build.ninja" ]; then
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/" \
+ PKG_CONFIG_PATH="${MEDIALIBRARY_PREFIX}/lib/pkgconfig:$LIBVLCJNI_SRC_DIR/vlc/contrib/$TARGET_TUPLE/lib/pkgconfig/" \
meson \
-Ddebug=true \
-Doptimization=${MEDIALIBRARY_OPTIMIZATION} \
More information about the Android
mailing list