From 0746b02aa91c91b03f9f2b922215a01aa1877fcc Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Wed, 30 Mar 2022 13:07:10 -0400
Subject: [PATCH] Update android cross file

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/617>
---
 data/cross-files/android_arm64.txt       | 20 ++++++++++++++++++++
 data/cross-files/android_arm64_api28.txt | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 data/cross-files/android_arm64.txt
 delete mode 100644 data/cross-files/android_arm64_api28.txt

diff --git a/data/cross-files/android_arm64.txt b/data/cross-files/android_arm64.txt
new file mode 100644
index 0000000000..350db6760c
--- /dev/null
+++ b/data/cross-files/android_arm64.txt
@@ -0,0 +1,20 @@
+[constants]
+ndk_path = '/path/to/android-ndk-r23b'
+toolchain = ndk_path / 'toolchains/llvm/prebuilt/linux-x86_64'
+
+[host_machine]
+system = 'android'
+cpu_family = 'aarch64'
+cpu = 'aarch64'
+endian = 'little'
+
+[properties]
+sys_root = toolchain / 'sysroot'
+c_ld = 'gold'
+cpp_ld = 'gold'
+
+[binaries]
+c =     toolchain / 'bin/aarch64-linux-android31-clang'
+cpp =   toolchain / 'bin/aarch64-linux-android31-clang++'
+ar =    toolchain / 'bin/llvm-ar'
+strip = toolchain / 'bin/llvm-strip'
diff --git a/data/cross-files/android_arm64_api28.txt b/data/cross-files/android_arm64_api28.txt
deleted file mode 100644
index 7137fabd17..0000000000
--- a/data/cross-files/android_arm64_api28.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-[host_machine]
-system = 'android'
-cpu_family = 'aarch64'
-cpu = 'aarch64'
-endian = 'little'
-
-[properties]
-sys_root = '/path/to/android-ndk-r21/sysroot'
-c_link_args = ['-fuse-ld=gold']
-cpp_link_args = ['-fuse-ld=gold']
-# Starting with 0.53.1, you can replace the above *_link_args:
-# c_ld = 'gold'
-# cpp_ld = 'gold'
-
-[binaries]
-c =     '/path/to/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang'
-cpp =   '/path/to/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang++'
-ar =    '/path/to/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar'
-strip = '/path/to/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip'
-pkgconfig = 'false'