Separate android initialization from Activity

android-project/app/build.gradle

@@ -55,6 +55,11 @@ android {
     lint {
         abortOnError false
     }
+    compileOptions {
+        // our minSdk, lollipop (API 21) uses java 7
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

android-project/app/proguard-rules.pro

@@ -16,7 +16,7 @@
 #   public *;
 #}
 
--keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivity {
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivityComponent {
     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();

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

@@ -0,0 +1,15 @@
+package org.libsdl.app;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marker annotation for {@link SDLActivityComponent} methods that correspond to
+ * events in {@link android.app.Activity}.
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.METHOD)
+public @interface ActivityHook {
+}

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() {
-        SDLActivity.nativeSetupJNI();
+        SDLActivityComponent.nativeSetupJNI();
         SDLAudioManager.nativeSetupJNI();
         SDLControllerManager.nativeSetupJNI();
     }
@@ -22,7 +22,7 @@ public static void setupJNI() {
     public static void initialize() {
         setContext(null);
 
-        SDLActivity.initialize();
+        SDLActivityComponent.initialize();
         SDLAudioManager.initialize();
         SDLControllerManager.initialize();
     }