Skip to content

Commit 4231848

Browse files
committed
Revert "Separate android initialization from Activity (#11891)"
This reverts commit d14c93c. This is a major breaking change for activities that inherit SDLActivity
1 parent 61f13b9 commit 4231848

16 files changed

+2154
-2317
lines changed

android-project/app/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ android {
5555
lint {
5656
abortOnError false
5757
}
58-
compileOptions {
59-
// our minSdk, lollipop (API 21) uses java 7
60-
sourceCompatibility JavaVersion.VERSION_1_7
61-
targetCompatibility JavaVersion.VERSION_1_7
62-
}
6358
}
6459

6560
dependencies {

android-project/app/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# public *;
1717
#}
1818

19-
-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivityComponent {
19+
-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivity {
2020
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
2121
java.lang.String clipboardGetText();
2222
boolean clipboardHasText();

android-project/app/src/main/java/org/libsdl/app/ActivityHook.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

android-project/app/src/main/java/org/libsdl/app/SDL.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class SDL {
1313
// This function should be called first and sets up the native code
1414
// so it can call into the Java classes
1515
public static void setupJNI() {
16-
SDLActivityComponent.nativeSetupJNI();
16+
SDLActivity.nativeSetupJNI();
1717
SDLAudioManager.nativeSetupJNI();
1818
SDLControllerManager.nativeSetupJNI();
1919
}
@@ -22,7 +22,7 @@ public static void setupJNI() {
2222
public static void initialize() {
2323
setContext(null);
2424

25-
SDLActivityComponent.initialize();
25+
SDLActivity.initialize();
2626
SDLAudioManager.initialize();
2727
SDLControllerManager.initialize();
2828
}

0 commit comments

Comments
 (0)