[Android] buildsystem: update meson crossfiles

[Thomas Guillem]

vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Jul 26 17:20:46 2022 +0200| [a61a92bda96a0875bcbd97702a63b689eeacb982] | committer: Nicolas Pomepuy

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.

> https://code.videolan.org/videolan/vlc-android/commit/a61a92bda96a0875bcbd97702a63b689eeacb982
---

 buildsystem/compile-medialibrary.sh                     |  2 +-
 .../{arm64-v8a.crossfile => arm64-v8a-ndk21.crossfile}  |  0
 buildsystem/crossfiles/arm64-v8a-ndk25.crossfile        | 17 +++++++++++++++++
 ...rmeabi-v7a.crossfile => armeabi-v7a-ndk21.crossfile} |  0
 buildsystem/crossfiles/armeabi-v7a-ndk25.crossfile      | 17 +++++++++++++++++
 .../crossfiles/{x86.crossfile => x86-ndk21.crossfile}   |  0
 buildsystem/crossfiles/x86-ndk25.crossfile              | 14 ++++++++++++++
 .../{x86_64.crossfile => x86_64-ndk21.crossfile}        |  0
 buildsystem/crossfiles/x86_64-ndk25.crossfile           | 16 ++++++++++++++++
 9 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 87aa4cd70..567de6800 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/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 \
diff --git a/buildsystem/crossfiles/arm64-v8a.crossfile b/buildsystem/crossfiles/arm64-v8a-ndk21.crossfile
similarity index 100%
rename from buildsystem/crossfiles/arm64-v8a.crossfile
rename to buildsystem/crossfiles/arm64-v8a-ndk21.crossfile
diff --git a/buildsystem/crossfiles/arm64-v8a-ndk25.crossfile b/buildsystem/crossfiles/arm64-v8a-ndk25.crossfile
new file mode 100644
index 000000000..149c9166c
--- /dev/null
+++ b/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'
diff --git a/buildsystem/crossfiles/armeabi-v7a.crossfile b/buildsystem/crossfiles/armeabi-v7a-ndk21.crossfile
similarity index 100%
rename from buildsystem/crossfiles/armeabi-v7a.crossfile
rename to buildsystem/crossfiles/armeabi-v7a-ndk21.crossfile
diff --git a/buildsystem/crossfiles/armeabi-v7a-ndk25.crossfile b/buildsystem/crossfiles/armeabi-v7a-ndk25.crossfile
new file mode 100644
index 000000000..1de0018ee
--- /dev/null
+++ b/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'
diff --git a/buildsystem/crossfiles/x86.crossfile b/buildsystem/crossfiles/x86-ndk21.crossfile
similarity index 100%
rename from buildsystem/crossfiles/x86.crossfile
rename to buildsystem/crossfiles/x86-ndk21.crossfile
diff --git a/buildsystem/crossfiles/x86-ndk25.crossfile b/buildsystem/crossfiles/x86-ndk25.crossfile
new file mode 100644
index 000000000..0b2cbfcfe
--- /dev/null
+++ b/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'
diff --git a/buildsystem/crossfiles/x86_64.crossfile b/buildsystem/crossfiles/x86_64-ndk21.crossfile
similarity index 100%
rename from buildsystem/crossfiles/x86_64.crossfile
rename to buildsystem/crossfiles/x86_64-ndk21.crossfile
diff --git a/buildsystem/crossfiles/x86_64-ndk25.crossfile b/buildsystem/crossfiles/x86_64-ndk25.crossfile
new file mode 100644
index 000000000..24cbc037a
--- /dev/null
+++ b/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'