Android: Make buildscript work on m1 (arm64) macOS

Requires a newer NDK version which drops support for older Android SDKs <19.

Though this is no problem for us as we already require API Level 20.

Author: Ghabry

android/1_download_library.sh

@@ -38,7 +38,7 @@ else
 	exit 1
 fi
 
-SDK_VERSION="9477386_latest"
+SDK_VERSION="11076708_latest"
 SDK_URL="https://dl.google.com/android/repository/commandlinetools-${SDK_PLATFORM}-${SDK_VERSION}.zip"
 curl -sSLOR "$SDK_URL"
 unzip commandlinetools-${SDK_PLATFORM}-${SDK_VERSION}.zip
@@ -53,12 +53,12 @@ msg " [2] Installing SDK and Platform-tools"
 # Otherwise installed to the wrong directory
 cd android-sdk
 
-# Android SDK Build-tools, revision 33.0.0
-echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "build-tools;33.0.0"
+# Android SDK Build-tools, revision 36.0.0
+echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "build-tools;36.0.0"
 # Android SDK Platform-tools
 echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "platform-tools"
-# SDK Platform Android 13, API 33
-echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "platforms;android-33"
+# SDK Platform Android 15, API 35
+echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "platforms;android-35"
 # Android Support Library Repository
 echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "extras;android;m2repository"
 # Google Repository
@@ -68,7 +68,7 @@ echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "cmake;3.22.1"
 
 msg " [3] Installing Android NDK"
 
-echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "ndk;21.4.7075529"
+echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "ndk;24.0.8215888"
 
 cd ..
 

android/2_build_toolchain.sh

@@ -59,13 +59,12 @@ function build() {
 	# $2: Toolchain architecture
 	# $3: Android arch
 	# $4: host for configure
-	# $5: additional CPP flags
 
 	cd $WORKSPACE
 
 	echo "Preparing $1 toolchain"
 
-	export TARGET_API=16
+	export TARGET_API=19
 	if [ "$3" = "arm64" ]; then
 		# Minimum API 21 on ARM64
 		export TARGET_API=21
@@ -84,7 +83,7 @@ function build() {
 	export NM=$NDK_PATH/llvm-nm
 	export RANLIB=$NDK_PATH/llvm-ranlib
 
-	export CFLAGS="-no-integrated-as -g0 -O2 -fPIC $5"
+	export CFLAGS="-g0 -O2 -fPIC"
 	export CXXFLAGS="$CFLAGS"
 	export CPPFLAGS="-I$PLATFORM_PREFIX/include -I$ANDROID_NDK/sources/android/cpufeatures"
 	export LDFLAGS="-L$PLATFORM_PREFIX/lib"
@@ -125,7 +124,7 @@ function build() {
 }
 
 export SDK_ROOT=$WORKSPACE/android-sdk
-export ANDROID_NDK=$SDK_ROOT/ndk/21.4.7075529
+export ANDROID_NDK=$SDK_ROOT/ndk/24.0.8215888
 
 export MAKEFLAGS="-j${nproc:-2}"
 
@@ -147,13 +146,13 @@ export ac_cv_func_mmap_fixed_mapped=yes
 export CMAKE_SYSTEM_NAME=Android
 
 # ARMeabi-v7a
-build "ARMeabi-v7a" "armeabi-v7a" "arm" "armv7a-linux-androideabi" "-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3"
+build "ARMeabi-v7a" "armeabi-v7a" "arm" "armv7a-linux-androideabi"
 
 # arm64-v8a
-build "AArch64" "arm64-v8a" "arm64" "aarch64-linux-android" ""
+build "AArch64" "arm64-v8a" "arm64" "aarch64-linux-android"
 
 # x86
-build "x86" "x86" "x86" "i686-linux-android" ""
+build "x86" "x86" "x86" "i686-linux-android"
 
 # x86_64
-build "x86_64" "x86_64" "x86_64" "x86_64-linux-android" ""
+build "x86_64" "x86_64" "x86_64" "x86_64-linux-android"