[nativeaot] support for Application subclasses

samples/NativeAOT/MainActivity.cs

@@ -1,4 +1,5 @@
 using Android.Runtime;
+using Android.Util;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
@@ -10,6 +11,8 @@ public class MainActivity : Activity
 {
     protected override void OnCreate(Bundle? savedInstanceState)
     {
+        Log.Debug ("NativeAOT", "Application.OnCreate()");
+
         base.OnCreate(savedInstanceState);
 
         // Set our view from the "main" layout resource

samples/NativeAOT/MainApplication.cs

@@ -0,0 +1,22 @@
+using Android.Runtime;
+using Android.Util;
+
+/// <summary>
+/// NOTE: This class is not required, but used for testing Android.App.Application subclasses.
+/// </summary>
+[Register ("my/MainApplication")] // Required for typemap in NativeAotTypeManager
+[Application]
+public class MainApplication : Application
+{
+    public MainApplication (IntPtr handle, JniHandleOwnership transfer)
+        : base (handle, transfer)
+    {
+    }
+
+    public override void OnCreate ()
+    {
+        Log.Debug ("NativeAOT", "Application.OnCreate()");
+
+        base.OnCreate ();
+    }
+}

samples/NativeAOT/NativeAotRuntimeProvider.java

@@ -21,6 +21,8 @@ public boolean onCreate() {
     public void attachInfo(android.content.Context context, android.content.pm.ProviderInfo info) {
         Log.d(TAG, "NativeAotRuntimeProvider.attachInfo(): calling JavaInteropRuntime.init()…");
         JavaInteropRuntime.init();
+        // NOTE: only required for custom applications
+        net.dot.jni.ApplicationRegistration.registerApplications();
         super.attachInfo (context, info);
     }
 

samples/NativeAOT/NativeAotTypeManager.cs

@@ -19,6 +19,7 @@ partial class NativeAotTypeManager : JniRuntime.JniTypeManager {
 		["android/os/Bundle"]                   = typeof (Android.OS.Bundle),
 		["android/view/ContextThemeWrapper"]    = typeof (Android.Views.ContextThemeWrapper),
 		["my/MainActivity"]                     = typeof (MainActivity),
+		["my/MainApplication"]                  = typeof (MainApplication),
 	};
 
 	public NativeAotTypeManager ()

src/Xamarin.Android.Build.Tasks/Resources/ApplicationRegistration.java

@@ -1,4 +1,4 @@
-package mono.android.app;
+package JAVA_PACKAGE_NAME;
 
 public class ApplicationRegistration {
 

src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs

@@ -300,19 +300,19 @@ Dictionary<string, ITaskItem> MaybeGetArchAssemblies (Dictionary<AndroidTargetAr
 
 		void GenerateAdditionalProviderSources (NativeCodeGenState codeGenState, IList<string> additionalProviders)
 		{
-			if (androidRuntime != Xamarin.Android.Tasks.AndroidRuntime.MonoVM) {
+			bool isMonoVm = androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.MonoVM;
+			if (!isMonoVm) {
 				Log.LogDebugMessage ($"Skipping MonoRuntimeProvider generation for: {androidRuntime}");
-				return;
-			}
-
-			// Create additional runtime provider java sources.
-			string providerTemplateFile = "MonoRuntimeProvider.Bundled.java";
-			string providerTemplate = GetResource (providerTemplateFile);
-
-			foreach (var provider in additionalProviders) {
-				var contents = providerTemplate.Replace ("MonoRuntimeProvider", provider);
-				var real_provider = Path.Combine (OutputDirectory, "src", "mono", provider + ".java");
-				Files.CopyIfStringChanged (contents, real_provider);
+			} else {
+				// Create additional runtime provider java sources.
+				string providerTemplateFile = "MonoRuntimeProvider.Bundled.java";
+				string providerTemplate = GetResource (providerTemplateFile);
+
+				foreach (var provider in additionalProviders) {
+					var contents = providerTemplate.Replace ("MonoRuntimeProvider", provider);
+					var real_provider = Path.Combine (OutputDirectory, "src", "mono", provider + ".java");
+					Files.CopyIfStringChanged (contents, real_provider);
+				}
 			}
 
 			// Create additional application java sources.
@@ -326,21 +326,27 @@ void GenerateAdditionalProviderSources (NativeCodeGenState codeGenState, IList<s
 
 					string javaKey = JavaNativeTypeManager.ToJniName (type, codeGenState.TypeCache).Replace ('/', '.');
 					regCallsWriter.WriteLine (
-						"\t\tmono.android.Runtime.register (\"{0}\", {1}.class, {1}.__md_methods);",
+						isMonoVm ?
+							"\t\tmono.android.Runtime.register (\"{0}\", {1}.class, {1}.__md_methods);" :
+							"\t\tnet.dot.jni.ManagedPeer.registerNativeMembers ({1}.class, {1}.__md_methods);",
 						type.GetAssemblyQualifiedName (codeGenState.TypeCache),
 						javaKey
 					);
 				}
 			}
 			regCallsWriter.Close ();
 
-			var real_app_dir = Path.Combine (OutputDirectory, "src", "mono", "android", "app");
+			var real_app_dir = isMonoVm ?
+				Path.Combine (OutputDirectory, "src", "mono", "android", "app") :
+				Path.Combine (OutputDirectory, "src", "net", "dot", "jni");
 			string applicationTemplateFile = "ApplicationRegistration.java";
 			SaveResource (
 				applicationTemplateFile,
 				applicationTemplateFile,
 				real_app_dir,
-				template => template.Replace ("// REGISTER_APPLICATION_AND_INSTRUMENTATION_CLASSES_HERE", regCallsWriter.ToString ())
+				template => template
+					.Replace ("JAVA_PACKAGE_NAME", isMonoVm ? "mono.android.app" : "net.dot.jni")
+					.Replace ("// REGISTER_APPLICATION_AND_INSTRUMENTATION_CLASSES_HERE", regCallsWriter.ToString ())
 			);
 		}