Android build fix

Author: XITRIX

app/include/keyboard_view.hpp

@@ -32,7 +32,6 @@ struct KeyboardLocale {
 struct KeyboardState {
     bool keys[_VK_KEY_MAX];
     KeyboardState() = default;
-    explicit KeyboardState(const bool keys[_VK_KEY_MAX]): keys(keys) {}
 };
 
 class KeyboardView;

app/platforms/android-project/app/build.gradle

@@ -1,35 +1,28 @@
-def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY');
-def buildAsApplication = !buildAsLibrary
-if (buildAsApplication) {
-    apply plugin: 'com.android.application'
-}
-else {
-    apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.application'
 }
 
+def buildWithCMake = project.hasProperty('BUILD_WITH_CMAKE');
+
 android {
-    compileSdkVersion 31
+    namespace = "com.borealis.demo"
+    compileSdkVersion 35
     defaultConfig {
-        if (buildAsApplication) {
-            applicationId "com.borealis.demo"
-        }
-        minSdkVersion 16
-        targetSdkVersion 31
+        minSdkVersion 21
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
-        // borealis need at least ndk r22 (r21 don't have std::filesystem support)
-        // The newer NDK library will cause lower versions of Android failed to run.
-        // r26: support api21 and later
-        // r24/r25: support api19 and later
-        // r22/23: support api16 and later
-        ndkVersion "22.1.7171670"
         externalNativeBuild {
-             cmake {
-                 arguments "-DANDROID_APP_PLATFORM=android-16", "-DANDROID_STL=c++_static"
-                 // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-                 abiFilters 'arm64-v8a'
-                 version = '3.16.0+'
-             }
+            ndkBuild {
+                arguments "APP_PLATFORM=android-21"
+                // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+                abiFilters 'arm64-v8a'
+            }
+            cmake {
+                arguments "-DANDROID_PLATFORM=android-21", "-DANDROID_STL=c++_static"
+                // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+                abiFilters 'arm64-v8a'
+            }
         }
     }
     buildTypes {
@@ -40,37 +33,23 @@ android {
     }
     applicationVariants.all { variant ->
         tasks["merge${variant.name.capitalize()}Assets"]
-            .dependsOn("externalNativeBuild${variant.name.capitalize()}")
+                .dependsOn("externalNativeBuild${variant.name.capitalize()}")
     }
     if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
         sourceSets.main {
             jniLibs.srcDir 'libs'
         }
         externalNativeBuild {
-             cmake {
-                 path 'jni/CMakeLists.txt'
-                 version = '3.16.0+'
-             }
-        }
-       
-    }
-    lintOptions {
-        abortOnError false
-    }
-    
-    if (buildAsLibrary) {
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith(".aar")) {
-                    def fileName = "org.libsdl.app.aar";
-                    output.outputFile = new File(outputFile.parent, fileName);
-                }
+            cmake {
+                path 'jni/CMakeLists.txt'
             }
         }
     }
+    lint {
+        abortOnError = false
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-}
+}

app/platforms/android-project/app/jni/vcpkg.json

@@ -13,6 +13,7 @@
     "libpng",
     "opus",
     "expat",
+    "zstd",
     {
         "name": "mbedtls",
         "platform": "!android"

app/platforms/android-project/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:8.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

app/platforms/android-project/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Nov 11 18:20:34 PST 2021
+#Mon Mar 31 20:41:09 CEST 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists