[Android] Ml: fix meson conf for following builds
Duncan McNamara
git at videolan.org
Tue Jul 7 12:56:43 UTC 2026
vlc-android | branch: master | Duncan McNamara <dcn.mcnamara at gmail.com> | Mon Jun 29 16:14:59 2026 +0200| [2a66d3c84534567dc5498c0132909c0455d3c341] | committer: Nicolas Pomepuy
Ml: fix meson conf for following builds
Set pkg_config_libdir on rebuild, without it subsequent builds fail.
> https://code.videolan.org/videolan/vlc-android/commit/2a66d3c84534567dc5498c0132909c0455d3c341
---
buildsystem/compile-medialibrary.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index edbd2ba49f..ba9ef69ec4 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -194,6 +194,14 @@ else
fi
printf 'cpu = '"'"'%s'"'"'\n' "${MESON_CPU}" >&3
+# This isn't set for meson builds if there already is a build dir which makes
+# following builds fail
+printf '\n[properties]\n' >&3
+printf "pkg_config_libdir = ['%s', '%s', '%s']\n" \
+ "$LIBVLCJNI_SRC_DIR/vlc/build-android-${TARGET_TUPLE}/install/lib/pkgconfig" \
+ "${MEDIALIBRARY_PREFIX}/lib/pkgconfig" \
+ "$LIBVLCJNI_SRC_DIR/vlc/contrib/$TARGET_TUPLE/lib/pkgconfig" >&3
+
if [ ! -d "build-android-$ANDROID_ABI/" ] || [ ! -f "build-android-$ANDROID_ABI/build.ninja" ]; then
export PATH="$LIBVLCJNI_SRC_DIR/vlc/extras/tools/build/bin:$PATH"
More information about the Android
mailing list