From f585f05839d60e9886e9c33db4a858903c7218db Mon Sep 17 00:00:00 2001
From: Miku AuahDark <lumi.hotaru@gmail.com>
Date: Sun, 13 Oct 2024 12:35:42 +0800
Subject: [PATCH] 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.
---
 app/build.gradle                                       | 8 ++++----
 app/src/main/java/org/love2d/android/GameActivity.java | 2 +-
 gradle.properties                                      | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e3251284..f4c368aa 100644
--- a/app/build.gradle
+++ b/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()
diff --git a/app/src/main/java/org/love2d/android/GameActivity.java b/app/src/main/java/org/love2d/android/GameActivity.java
index b4a6171c..8028d597 100644
--- a/app/src/main/java/org/love2d/android/GameActivity.java
+++ b/app/src/main/java/org/love2d/android/GameActivity.java
@@ -77,7 +77,7 @@ protected String getMainSharedObject() {
     protected String[] getLibraries() {
         return new String[]{
             "c++_shared",
-            "SDL2",
+            "SDL3",
             "oboe",
             "openal",
             "luajit",
diff --git a/gradle.properties b/gradle.properties
index d29c1162..6eb0ab02 100644
--- a/gradle.properties
+++ b/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