Revert "Separate android initialization from Activity (#11891)"

This reverts commit d14c93c. This is a major breaking change for activities that inherit SDLActivity
libsdl-org · Jan 10, 2025 · 4231848 · 4231848
1 parent 61f13b9
commit 4231848
Show file tree

Hide file tree

Showing 16 changed files with 2,154 additions and 2,317 deletions.
diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
@@ -55,11 +55,6 @@ android {
     lint {
         abortOnError false
     }
-    compileOptions {
-        // our minSdk, lollipop (API 21) uses java 7
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 }
 
 dependencies {

diff --git a/android-project/app/proguard-rules.pro b/android-project/app/proguard-rules.pro
@@ -16,7 +16,7 @@
 #   public *;
 #}
 
--keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivityComponent {
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivity {
     java.lang.String nativeGetHint(java.lang.String); # Java-side doesn't use this, so it gets minified, but C-side still tries to register it
     java.lang.String clipboardGetText();
     boolean clipboardHasText();

diff --git a/android-project/app/src/main/java/org/libsdl/app/ActivityHook.java b/android-project/app/src/main/java/org/libsdl/app/ActivityHook.java
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDL.java b/android-project/app/src/main/java/org/libsdl/app/SDL.java
@@ -13,7 +13,7 @@ public class SDL {
     // This function should be called first and sets up the native code
     // so it can call into the Java classes
     public static void setupJNI() {
-        SDLActivityComponent.nativeSetupJNI();
+        SDLActivity.nativeSetupJNI();
         SDLAudioManager.nativeSetupJNI();
         SDLControllerManager.nativeSetupJNI();
     }
@@ -22,7 +22,7 @@ public static void setupJNI() {
     public static void initialize() {
         setContext(null);
 
-        SDLActivityComponent.initialize();
+        SDLActivity.initialize();
         SDLAudioManager.initialize();
         SDLControllerManager.initialize();
     }