buildsystem: update meson crossfiles

We need 2 versions for each ABI, one for NDK21, one for NDK25.

The NDK21 ones will be removed one day.

buildsystem/compile-medialibrary.sh

@@ -149,7 +149,7 @@ if [ ! -d "build-android-$ANDROID_ABI/" -o ! -f "build-android-$ANDROID_ABI/buil
         -Doptimization=${MEDIALIBRARY_OPTIMIZATION} \
         -Db_ndebug=${MEDIALIBRARY_NDEBUG} \
         -Ddefault_library=static \
-        --cross-file ${SRC_DIR}/buildsystem/crossfiles/${ANDROID_ABI}.crossfile \
+        --cross-file ${SRC_DIR}/buildsystem/crossfiles/${ANDROID_ABI}-ndk${REL}.crossfile \
         -Dlibjpeg_prefix="$SRC_DIR/vlc/contrib/$TARGET_TUPLE/" \
         -Dtests=disabled \
         -Dforce_attachment_api=true \

buildsystem/crossfiles/arm64-v8a-ndk25.crossfile

@@ -0,0 +1,17 @@
+# Automatically generated by contrib makefile
+
+[binaries]
+c = 'aarch64-linux-android21-clang'
+cpp = 'aarch64-linux-android21-clang++'
+ar = 'llvm-ar'
+strip = 'llvm-strip'
+pkgconfig = 'pkg-config'
+
+[properties]
+needs_exe_wrapper = true
+
+[host_machine]
+system = 'android'
+cpu_family = 'aarch64'
+endian = 'little'
+cpu = 'aarch64'

buildsystem/crossfiles/armeabi-v7a-ndk25.crossfile

@@ -0,0 +1,17 @@
+# Automatically generated by contrib makefile
+
+[binaries]
+c = 'armv7a-linux-androideabi21-clang'
+cpp = 'armv7a-linux-androideabi21-clang++'
+ar = 'llvm-ar'
+strip = 'llvm-strip'
+pkgconfig = 'pkg-config'
+
+[properties]
+needs_exe_wrapper = true
+
+[host_machine]
+system = 'android'
+cpu_family = 'arm'
+endian = 'little'
+cpu = 'arm'

buildsystem/crossfiles/x86-ndk25.crossfile

@@ -0,0 +1,14 @@
+# Automatically generated by contrib makefile
+
+[binaries]
+c = 'i686-linux-android21-clang'
+cpp = 'i686-linux-android21-clang++'
+ar = 'llvm-ar'
+strip = 'llvm-strip'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'android'
+cpu_family = 'x86'
+endian = 'little'
+cpu = 'i686'

buildsystem/crossfiles/x86_64-ndk25.crossfile

@@ -0,0 +1,16 @@
+# Automatically generated by contrib makefile
+
+[binaries]
+c = 'x86_64-linux-android21-clang'
+cpp = 'x86_64-linux-android21-clang++'
+ar = 'llvm-ar'
+strip = 'llvm-strip'
+pkgconfig = 'pkg-config'
+
+[properties]
+
+[host_machine]
+system = 'android'
+cpu_family = 'x86_64'
+endian = 'little'
+cpu = 'x86_64'