Remove some legacy options after Gradle migration.

If user is compiling with CMake 4, ensure it doesn't fail.

Issue #300.

.github/workflows/main.yml

@@ -8,6 +8,8 @@ jobs:
     strategy:
       matrix:
         build_type: [Debug, Release]
+    env:
+      GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx4G'"
     steps:
     - name: Prepare Environment
       run: sudo apt-get update && curl -Lo kitware-archive.sh https://apt.kitware.com/kitware-archive.sh && sudo bash ./kitware-archive.sh
@@ -62,4 +64,4 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: love-android-unstripped-debugsyms-${{ matrix.build_type }}
-        path: love/build/intermediates/library_jni
+        path: app/build/intermediates/cxx

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "app/src/main/cpp/love"]
 	path = app/src/main/cpp/love
 	url = https://github.com/love2d/love
-	branch = 12.0-development
+	branch = main
 [submodule "app/src/main/cpp/megasource"]
 	path = app/src/main/cpp/megasource
 	url = https://github.com/love2d/megasource
-	branch = 12.x
+	branch = main

app/build.gradle

@@ -6,28 +6,34 @@ plugins {
 
 android {
     namespace "org.love2d.android"
-    ndkVersion "26.1.10909125"
+    ndkVersion '27.3.13750724'
 
     defaultConfig {
         applicationId project.properties["app.application_id"]
         versionCode project.properties["app.version_code"].toInteger()
         versionName project.properties["app.version_name"]
         minSdk 23
-        compileSdk 34
+        compileSdk = 35
-        targetSdk 34
+        targetSdk 35
 
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_STL=c++_shared"
+                arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=1", "-DCMAKE_POLICY_VERSION_MINIMUM=3.5", "-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON", "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                 // 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
-                // APK. "love" target depends on LuaJIT, and OpenAL that depends on oboe::oboe. So,
+                // APK. "love" target depends on LuaJIT, and "OpenAL" target depends on oboe::oboe
-                // add "OpenAL" and "love" target.
+                // (which provides liboboe.so). So, add "OpenAL" and "love" target.
                 targets "love_android", "OpenAL", "love"
             }
         }
 
+        ndk {
+            //noinspection ChromeOsAbiSupport
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
+            debugSymbolLevel 'full'
+        }
+
         def getAppName = {
             def nameArray = project.properties["app.name_byte_array"]
             def name = project.properties["app.name"]
@@ -118,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()
@@ -162,14 +168,14 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
-    implementation 'androidx.navigation:navigation-fragment:2.7.3'
+    implementation 'androidx.navigation:navigation-fragment:2.8.5'
-    implementation 'androidx.navigation:navigation-ui:2.7.3'
+    implementation 'androidx.navigation:navigation-ui:2.8.5'
-    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'com.google.oboe:oboe:1.7.0'
+    implementation 'com.google.oboe:oboe:1.9.3'
 }
 
 // We don't even use Kotlin. Why we have to care about it?

app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
+<manifest xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -7,8 +7,10 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
-    <!-- OpenGL ES 2.0 -->
+    <!-- OpenGL ES 3.0 -->
-    <uses-feature android:glEsVersion="0x00020000" />
+    <uses-feature android:glEsVersion="0x00030000" />
+    <!-- Vulkan 1.1 -->
+    <uses-feature android:name="android.hardware.vulkan.version" android:version="0x401000" android:required="false" tools:targetApi="n" />
     <!-- Touchscreen support -->
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <!-- Game controller support -->
@@ -21,6 +23,7 @@
     <uses-feature android:name="android.hardware.audio.low_latency" android:required="false" />
     <uses-feature android:name="android.hardware.audio.pro" android:required="false" />
 
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/love"
@@ -33,6 +36,8 @@
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation"
             android:launchMode="singleInstance"
             android:screenOrientation="${ORIENTATION}">
+            <!-- Allow app activity re-created -->
+            <meta-data android:name="SDL_ENV.SDL_ANDROID_ALLOW_RECREATE_ACTIVITY" android:value="1" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/org/love2d/android/GameActivity.java

@@ -30,7 +30,6 @@ import android.graphics.Rect;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.ParcelFileDescriptor;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.util.DisplayMetrics;
@@ -77,10 +76,11 @@ public class GameActivity extends SDLActivity {
     protected String[] getLibraries() {
         return new String[]{
             "c++_shared",
-            "SDL2",
+            "SDL3",
             "oboe",
             "openal",
             "luajit",
+            "liblove",
             "love",
         };
     }
@@ -101,9 +101,9 @@ public class GameActivity extends SDLActivity {
         }
 
         Intent intent = getIntent();
-        // Prevent SDL sending filedropped event. Let us do that instead.
-        setIntent(null);
         handleIntent(intent, true);
+        // Prevent SDL sending filedropped event. Let us do that instead.
+        intent.setData(null);
 
         super.onCreate(savedInstanceState);
 
@@ -214,12 +214,6 @@ public class GameActivity extends SDLActivity {
         }
     }
 
-    @Keep
-    public boolean openURLFromLOVE(String url) {
-        Log.d(TAG, "opening url = " + url);
-        return openURL(url) == 0;
-    }
-
     @Keep
     public boolean hasBackgroundMusic() {
         AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
@@ -329,11 +323,6 @@ public class GameActivity extends SDLActivity {
         }
     }
 
-    @Keep
-    public int convertToFileDescriptor(String uri) {
-        return convertToFileDescriptor(Uri.parse(uri));
-    }
-
     public int getAudioSMP() {
         int smp = 256;
         AudioManager a = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
@@ -359,12 +348,8 @@ public class GameActivity extends SDLActivity {
     }
 
     public boolean isNativeLibsExtracted() {
-        if (android.os.Build.VERSION.SDK_INT >= 23) {
+        ApplicationInfo appInfo = getApplicationInfo();
-            ApplicationInfo appInfo = getApplicationInfo();
+        return (appInfo.flags & ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS) != 0;
-            return (appInfo.flags & ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS) != 0;
-        }
-
-        return false;
     }
 
     public void sendUriAsDroppedFile(Uri uri) {
@@ -431,32 +416,14 @@ public class GameActivity extends SDLActivity {
         return map;
     }
 
-    private int convertToFileDescriptor(Uri uri) {
-        int fd = -1;
-
-        try {
-            ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r");
-            if (pfd == null) {
-                throw new RuntimeException("pfd is null");
-            }
-
-            fd = pfd.dup().detachFd();
-            pfd.close();
-        } catch (Exception e) {
-            Log.e(TAG, "Failed attempt to convert " + uri.toString() + " to file descriptor", e);
-        }
-
-        return fd;
-    }
-
     private void processOpenGame(Uri game) {
         String scheme = game.getScheme();
         String path = game.getPath();
 
         if (scheme != null) {
             if (scheme.equals("content")) {
-                // Convert the URI to file descriptor.
+                // Pass content URI as-is.
-                args = new String[]{"/love2d://fd/" + convertToFileDescriptor(game)};
+                args = new String[]{game.toString()};
             } else if (scheme.equals("file")) {
                 // Regular file, pass as-is.
                 args = new String[]{path};

build.gradle

@@ -5,13 +5,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:9.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

gradle.properties

@@ -14,6 +14,6 @@ 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
+android.dependency.useConstraints=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -3,7 +3,6 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        jcenter() // Warning: this repository is going to shut down soon
     }
 }
 rootProject.name = "LÖVE for Android"