Browse Source

Update to SDL3 and target Android 15.

Currently game selection (the "LOVE Loader") equivalent is currently broken, but it will be addressed in future cleanup.
Miku AuahDark 1 year ago
parent
commit
f585f05839
3 changed files with 5 additions and 6 deletions
  1. 4 4
      app/build.gradle
  2. 1 1
      app/src/main/java/org/love2d/android/GameActivity.java
  3. 0 1
      gradle.properties

+ 4 - 4
app/build.gradle

@@ -13,12 +13,12 @@ android {
         versionCode project.properties["app.version_code"].toInteger()
         versionName project.properties["app.version_name"]
         minSdk 23
-        compileSdk 34
-        targetSdk 34
+        compileSdk 35
+        targetSdk 35
 
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_STL=c++_shared"
+                arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=1"
                 // https://issuetracker.google.com/issues/274493986
                 // Transitive shared library that's added through `add_dependencies` is not taken into
                 // account. This result in liboboe.so and libluajit.so not get included into the final
@@ -124,7 +124,7 @@ android {
     sourceSets {
         main {
             java {
-                srcDir 'src/main/cpp/megasource/libs/SDL2/android-project/app/src/main/java'
+                srcDir 'src/main/cpp/megasource/libs/SDL3/android-project/app/src/main/java'
                 srcDir 'src/main/java'
                 srcDir 'src/main/cpp/love/src/libraries/luahttps/src/android/java'
                 srcDirs += retrieveAll3pModules()

+ 1 - 1
app/src/main/java/org/love2d/android/GameActivity.java

@@ -77,7 +77,7 @@ public class GameActivity extends SDLActivity {
     protected String[] getLibraries() {
         return new String[]{
             "c++_shared",
-            "SDL2",
+            "SDL3",
             "oboe",
             "openal",
             "luajit",

+ 0 - 1
gradle.properties

@@ -14,6 +14,5 @@ app.version_name=12.0
 # No need to modify anything past this line!
 android.enableJetifier=false
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true