ANDROID: install newer versions to work with more recent java versions

Author: mgerhardy

cmake/toolchains/android-toolchain.cmake

@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Android)
-set(CMAKE_SYSTEM_VERSION 21) # API level
+set(CMAKE_SYSTEM_VERSION 28) # API level
 set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)
 set(CMAKE_ANDROID_NDK ${ANDROID_NDK})
 set(CMAKE_ANDROID_STL_TYPE c++_static)
-set(CMAKE_ANDROID_API_MIN 21)
+set(CMAKE_ANDROID_API_MIN 28)
 set(ANDROID True)

contrib/scripts/setup-android.sh

@@ -3,18 +3,25 @@
 # taken from https://github.com/floooh/sokol/blob/master/tests/test_common.sh
 
 setup_android() {
-    if [ ! -d "build/android_sdk" ] ; then
-        mkdir -p build/android_sdk && cd build/android_sdk
-        sdk_file="sdk-tools-linux-3859397.zip"
-        wget --no-verbose https://dl.google.com/android/repository/$sdk_file
-        unzip -q $sdk_file
-        cd tools/bin
-        yes | ./sdkmanager "platforms;android-28" >/dev/null
-        yes | ./sdkmanager "build-tools;29.0.3" >/dev/null
-        yes | ./sdkmanager "platform-tools" >/dev/null
-        yes | ./sdkmanager "ndk-bundle" >/dev/null
-        cd ../../../..
-    fi
+	if [ ! -d "build/android_sdk" ] ; then
+		mkdir -p build/android_sdk && cd build/android_sdk
+		sdk_file="commandlinetools-linux-11076708_latest.zip"
+		wget --no-verbose https://dl.google.com/android/repository/$sdk_file
+		unzip -q $sdk_file
+		cd cmdline-tools/bin
+		echo "Install platform android"
+		yes | ./sdkmanager --sdk_root=. "platforms;android-28" >/dev/null
+
+		echo "Install build-tools"
+		yes | ./sdkmanager --sdk_root=. "build-tools;29.0.3" >/dev/null
+
+		echo "Install platform-tools"
+		yes | ./sdkmanager --sdk_root=. "platform-tools" >/dev/null
+
+		echo "Install ndk-bundle"
+		yes | ./sdkmanager --sdk_root=. "ndk-bundle" >/dev/null
+		cd ../../../..
+	fi
 }
 
 setup_android