[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", "MainActivity.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/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NativeAOT.targets

@@ -12,6 +12,7 @@ This file contains the NativeAOT-specific MSBuild logic for .NET for Android.
   <!-- Default property values for NativeAOT -->
   <PropertyGroup>
     <_AndroidRuntimePackRuntime>NativeAOT</_AndroidRuntimePackRuntime>
+    <_AndroidCodeGenerationTarget Condition=" '$(_AndroidCodeGenerationTarget)' == '' ">JavaInterop1</_AndroidCodeGenerationTarget>
     <!-- NativeAOT's targets currently gives an error about cross-compilation -->
     <DisableUnsupportedError Condition=" $([MSBuild]::IsOSPlatform('windows')) and '$(DisableUnsupportedError)' == '' ">true</DisableUnsupportedError>
   </PropertyGroup>

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

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

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

@@ -96,14 +96,19 @@ public class GenerateJavaStubs : AndroidTask
 		[Required]
 		public string AndroidRuntime { get; set; } = "";
 
+		[Required]
+		public string CodeGenerationTarget { get; set; } = "";
+
 		AndroidRuntime androidRuntime;
+		JavaPeerStyle codeGenerationTarget;
 
 		internal const string AndroidSkipJavaStubGeneration = "AndroidSkipJavaStubGeneration";
 
 		public override bool RunTask ()
 		{
 			try {
 				androidRuntime = MonoAndroidHelper.ParseAndroidRuntime (AndroidRuntime);
+				codeGenerationTarget = MonoAndroidHelper.ParseCodeGenerationTarget (CodeGenerationTarget);
 				bool useMarshalMethods = !Debug && EnableMarshalMethods;
 				Run (useMarshalMethods);
 			} catch (XamarinAndroidException e) {
@@ -300,24 +305,24 @@ 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.
 			StringWriter regCallsWriter = new StringWriter ();
-			regCallsWriter.WriteLine ("\t\t// Application and Instrumentation ACWs must be registered first.");
+			regCallsWriter.WriteLine ("// Application and Instrumentation ACWs must be registered first.");
 			foreach (TypeDefinition type in codeGenState.JavaTypesForJCW) {
 				if (JavaNativeTypeManager.IsApplication (type, codeGenState.TypeCache) || JavaNativeTypeManager.IsInstrumentation (type, codeGenState.TypeCache)) {
 					if (codeGenState.Classifier != null && !codeGenState.Classifier.FoundDynamicallyRegisteredMethods (type)) {
@@ -326,15 +331,17 @@ 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);",
+						codeGenerationTarget == JavaPeerStyle.XAJavaInterop1 ?
+							"\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 = Path.Combine (OutputDirectory, "src", "net", "dot", "jni");
 			string applicationTemplateFile = "ApplicationRegistration.java";
 			SaveResource (
 				applicationTemplateFile,
@@ -392,7 +399,7 @@ IList<string> MergeManifest (NativeCodeGenState codeGenState, Dictionary<string,
 			(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) = ScanForJavaTypes (resolver, tdCache, assemblies, userAssemblies, useMarshalMethods);
 			var jcwContext = new JCWGeneratorContext (arch, resolver, assemblies.Values, javaTypesForJCW, tdCache, useMarshalMethods);
 			var jcwGenerator = new JCWGenerator (Log, jcwContext) {
-				CodeGenerationTarget = androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.MonoVM ? JavaPeerStyle.XAJavaInterop1 : JavaPeerStyle.JavaInterop1
+				CodeGenerationTarget = codeGenerationTarget,
 			};
 			bool success;
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

@@ -1093,12 +1093,12 @@ public void RemoveOldMonoPackageManager ()
 				};
 				var intermediate = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
 				var oldMonoPackageManager = Path.Combine (intermediate, "android", "src", "mono", "MonoPackageManager.java");
-				var notifyTimeZoneChanges = Path.Combine (intermediate, "android", "src", "mono", "android", "app", "NotifyTimeZoneChanges.java");
+				var notifyTimeZoneChanges = Path.Combine (intermediate, "android", "src", "net", "dot", "jni", "NotifyTimeZoneChanges.java");
 				Directory.CreateDirectory (Path.GetDirectoryName (notifyTimeZoneChanges));
 				File.WriteAllText (oldMonoPackageManager, @"package mono;
 public class MonoPackageManager { }
 class MonoPackageManager_Resources { }");
-				File.WriteAllText (notifyTimeZoneChanges, @"package mono.android.app;
+				File.WriteAllText (notifyTimeZoneChanges, @"package net.dot.jni;
 public class ApplicationRegistration { }");
 				var oldMonoPackageManagerClass = Path.Combine (intermediate, "android", "bin", "classes" , "mono", "MonoPackageManager.class");
 				File.WriteAllText (oldMonoPackageManagerClass, "");

src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs

@@ -9,6 +9,7 @@
 using System.Threading;
 using Xamarin.Android.Tools;
 using Xamarin.Tools.Zip;
+using Java.Interop.Tools.JavaCallableWrappers;
 
 #if MSBUILD
 using Microsoft.Android.Build.Tasks;
@@ -830,5 +831,14 @@ public static AndroidRuntime ParseAndroidRuntime (string androidRuntime)
 			// Default runtime is MonoVM
 			return AndroidRuntime.MonoVM;
 		}
+
+		public static JavaPeerStyle ParseCodeGenerationTarget (string codeGenerationTarget)
+		{
+			if (Enum.TryParse (codeGenerationTarget, ignoreCase: true, out JavaPeerStyle style))
+				return style;
+
+			// Default is XAJavaInterop1
+			return JavaPeerStyle.XAJavaInterop1;
+		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -1501,6 +1501,7 @@ because xbuild doesn't support framework reference assemblies.
 
   <GenerateJavaStubs
       AndroidRuntime="$(_AndroidRuntime)"
+      CodeGenerationTarget="$(_AndroidCodeGenerationTarget)"
       ResolvedAssemblies="@(_ResolvedAssemblies)"
       ResolvedUserAssemblies="@(_ResolvedUserMonoAndroidAssemblies)"
       ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"

src/java-runtime/java-runtime.targets

@@ -62,7 +62,7 @@
   />
   <!-- These files are auto generated at app build time so should be removed from the runtime.jar -->
   <Delete Files="%(_RuntimeOutput.IntermediateRuntimeOutputPath)\mono\MonoPackageManager_Resources.class" />
-  <Delete Files="%(_RuntimeOutput.IntermediateRuntimeOutputPath)\mono\android\app\ApplicationRegistration.class" />
+  <Delete Files="%(_RuntimeOutput.IntermediateRuntimeOutputPath)\net\dot\jni\ApplicationRegistration.class" />
   <Delete Files="%(_RuntimeOutput.IntermediateRuntimeOutputPath)\mono\android\app\XamarinAndroidEnvironmentVariables.class" />
   <Exec
       Condition="Exists('%(_RuntimeOutput.OutputJar)')"

src/java-runtime/java/mono/android/MonoPackageManager.java

@@ -129,7 +129,7 @@ public static void LoadApplication (Context context)
 						haveSplitApks
 					);
 
-				mono.android.app.ApplicationRegistration.registerApplications ();
+				net.dot.jni.ApplicationRegistration.registerApplications ();
 
 				initialized = true;
 			}

src/java-runtime/java/mono/android/app/ApplicationRegistration.java → src/java-runtime/java/net/dot/ApplicationRegistration.java

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