From 8385796ca1c68bd13d72c58ee2ee164557f1b392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= <lbphacker@gmail.com>
Date: Sun, 1 Oct 2023 10:53:59 +0200
Subject: [PATCH] Bump android toolchain version to 21

---
 .github/build.sh                     | 4 ++--
 android/AndroidManifest.template.xml | 2 +-
 android/cross/arm.ini                | 2 +-
 android/cross/x86.ini                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/build.sh b/.github/build.sh
index b6ccdece8..8e17c3c93 100755
--- a/.github/build.sh
+++ b/.github/build.sh
@@ -143,9 +143,9 @@ elif [[ $BSH_HOST_PLATFORM == darwin ]]; then
 elif [[ $BSH_HOST_PLATFORM == android ]]; then
 	case $BSH_HOST_ARCH in
 	x86_64)  android_toolchain_prefix=x86_64-linux-android    ; android_system_version=21; android_arch_abi=x86_64     ;;
-	x86)     android_toolchain_prefix=i686-linux-android      ; android_system_version=19; android_arch_abi=x86        ;;
+	x86)     android_toolchain_prefix=i686-linux-android      ; android_system_version=21; android_arch_abi=x86        ;;
 	aarch64) android_toolchain_prefix=aarch64-linux-android   ; android_system_version=21; android_arch_abi=arm64-v8a  ;;
-	arm)     android_toolchain_prefix=armv7a-linux-androideabi; android_system_version=19; android_arch_abi=armeabi-v7a;;
+	arm)     android_toolchain_prefix=armv7a-linux-androideabi; android_system_version=21; android_arch_abi=armeabi-v7a;;
 	esac
 	android_toolchain_dir=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64
 	CC=$android_toolchain_dir/bin/$android_toolchain_prefix$android_system_version-clang
diff --git a/android/AndroidManifest.template.xml b/android/AndroidManifest.template.xml
index 40b5d93c7..9f998578b 100644
--- a/android/AndroidManifest.template.xml
+++ b/android/AndroidManifest.template.xml
@@ -7,7 +7,7 @@
 	android:installLocation="auto"
 >
 	<uses-sdk
-		android:minSdkVersion="19"
+		android:minSdkVersion="21"
 		android:targetSdkVersion="30"
 	/>
 	<uses-feature
diff --git a/android/cross/arm.ini b/android/cross/arm.ini
index d01c86f98..ff4ac8474 100644
--- a/android/cross/arm.ini
+++ b/android/cross/arm.ini
@@ -1,5 +1,5 @@
 [constants]
-android_ndk_toolchain_prefix = 'armv7a-linux-androideabi19-'
+android_ndk_toolchain_prefix = 'armv7a-linux-androideabi21-'
 
 [host_machine]
 system = 'android'
diff --git a/android/cross/x86.ini b/android/cross/x86.ini
index 46de8fc66..ab215a81a 100644
--- a/android/cross/x86.ini
+++ b/android/cross/x86.ini
@@ -1,5 +1,5 @@
 [constants]
-android_ndk_toolchain_prefix = 'i686-linux-android19-'
+android_ndk_toolchain_prefix = 'i686-linux-android21-'
 
 [host_machine]
 system = 'android'