Browse Source

switch android tests to android-30 platform

Andre Weissflog 3 months ago
parent
commit
d5adfd628a
2 changed files with 5 additions and 5 deletions
  1. 4 4
      tests/CMakePresets.json
  2. 1 1
      tests/test_common.sh

+ 4 - 4
tests/CMakePresets.json

@@ -418,7 +418,7 @@
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "ANDROID_ABI": "armeabi-v7a",
-                "ANDROID_PLATFORM": "android-28",
+                "ANDROID_PLATFORM": "android-30",
                 "CMAKE_BUILD_TYPE": "Debug"
             }
         },
@@ -430,7 +430,7 @@
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "ANDROID_ABI": "armeabi-v7a",
-                "ANDROID_PLATFORM": "android-28",
+                "ANDROID_PLATFORM": "android-30",
                 "CMAKE_BUILD_TYPE": "Release"
             }
         },
@@ -442,7 +442,7 @@
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "ANDROID_ABI": "armeabi-v7a",
-                "ANDROID_PLATFORM": "android-28",
+                "ANDROID_PLATFORM": "android-30",
                 "CMAKE_BUILD_TYPE": "Debug",
                 "SOKOL_FORCE_SLES": {
                     "type": "BOOL",
@@ -458,7 +458,7 @@
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "ANDROID_ABI": "armeabi-v7a",
-                "ANDROID_PLATFORM": "android-28",
+                "ANDROID_PLATFORM": "android-30",
                 "CMAKE_BUILD_TYPE": "Release",
                 "SOKOL_FORCE_SLES": {
                     "type": "BOOL",

+ 1 - 1
tests/test_common.sh

@@ -17,7 +17,7 @@ setup_android() {
         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 "platforms;android-30" >/dev/null
         yes | ./sdkmanager "build-tools;29.0.3" >/dev/null
         yes | ./sdkmanager "platform-tools" >/dev/null
         yes | ./sdkmanager "ndk-bundle" >/dev/null