Enable marshal methods support by default

Directory.Build.props

@@ -25,10 +25,6 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'Core' ">
-    <_EnableMarshalMethods>NoThanks</_EnableMarshalMethods> <!-- set to YesPlease to enable -->
-  </PropertyGroup>
-
   <PropertyGroup>
     <ProductVersion>13.0.99</ProductVersion>
     <!-- NuGet package version numbers. See Documentation/guides/OneDotNet.md.

build-tools/scripts/JavaCallableWrappers.targets

@@ -23,7 +23,6 @@
     />
     <ItemGroup>
       <_JavaSources Include="$(IntermediateOutputPath)jcw\src\**\*.java" />
-      <_JavaSources Include="$(JavaInteropSourceDirectory)\src\Java.Interop\java\com\xamarin\**\*.java" />
     </ItemGroup>
     <WriteLinesToFile
         File="$(IntermediateOutputPath)jcw/classes.txt"

src/Mono.Android/Android.Runtime/AndroidRuntime.cs

@@ -473,28 +473,18 @@ static bool CallRegisterMethodByIndex (JniNativeMethodRegistrationArguments argu
 		public override void RegisterNativeMembers (JniType nativeClass, Type type, string? methods) =>
 			RegisterNativeMembers (nativeClass, type, methods.AsSpan ());
 
-#if ENABLE_MARSHAL_METHODS
 		// Temporary hack, see comments in RegisterNativeMembers below
 		static readonly Dictionary<string, string[]> dynamicRegistrationMethods = new Dictionary<string, string[]> (StringComparer.Ordinal) {
-			{"Android.Views.View+IOnLayoutChangeListenerImplementor",             new string[] { "GetOnLayoutChange_Landroid_view_View_IIIIIIIIHandler" }},
-			{"Android.Views.View+IOnLayoutChangeListenerInvoker",                 new string[] { "GetOnLayoutChange_Landroid_view_View_IIIIIIIIHandler" }},
-			{"Java.Interop.TypeManager+JavaTypeManager",                          new string[] { "GetActivateHandler" }},
+			// leaving it empty for now, until we're sure it's no longer needed (there are some test failures which may still require it to fix them)
 		};
-#endif
 
 		public void RegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<char> methods)
 		{
-#if ENABLE_MARSHAL_METHODS
-			Logger.Log (LogLevel.Info, "monodroid-mm", $"RegisterNativeMembers ('{nativeClass?.Name}', '{type?.FullName}', '{methods.ToString ()}')");
-			Logger.Log (LogLevel.Info, "monodroid-mm", "RegisterNativeMembers called from:");
-			var st = new StackTrace (true);
-			Logger.Log (LogLevel.Info, "monodroid-mm", st.ToString ());
-
 			if (methods.IsEmpty) {
-				Logger.Log (LogLevel.Info, "monodroid-mm", "No methods to register, returning");
+				Logger.Log (LogLevel.Debug, "monodroid-mm", "No methods to register, returning");
 				return;
 			}
-#endif
+
 			try {
 				if (FastRegisterNativeMembers (nativeClass, type, methods))
 					return;
@@ -517,9 +507,8 @@ public void RegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<
 				MethodInfo []? typeMethods = null;
 
 				ReadOnlySpan<char> methodsSpan = methods;
-#if ENABLE_MARSHAL_METHODS
 				bool needToRegisterNatives = false;
-#endif
+
 				while (!methodsSpan.IsEmpty) {
 					int newLineIndex = methodsSpan.IndexOf ('\n');
 
@@ -545,9 +534,7 @@ public void RegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<
 							if (minfo == null)
 								throw new InvalidOperationException (String.Format ("Specified managed method '{0}' was not found. Signature: {1}", mname.ToString (), signature.ToString ()));
 							callback = CreateDynamicCallback (minfo);
-#if ENABLE_MARSHAL_METHODS
 							needToRegisterNatives = true;
-#endif
 						} else {
 							Type callbackDeclaringType = type;
 							if (!callbackDeclaringTypeString.IsEmpty) {
@@ -556,64 +543,57 @@ public void RegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<
 							while (callbackDeclaringType.ContainsGenericParameters) {
 								callbackDeclaringType = callbackDeclaringType.BaseType!;
 							}
-#if ENABLE_MARSHAL_METHODS
+
 							// TODO: this is temporary hack, it needs a full fledged registration mechanism for methods like these (that is, ones which
 							// aren't registered with [Register] but are baked into Mono.Android's managed and Java code)
-							bool createCallback = false;
-							string declaringTypeName = callbackDeclaringType.FullName;
-							string callbackName = callbackString.ToString ();
-
-							foreach (var kvp in dynamicRegistrationMethods) {
-								string dynamicTypeName = kvp.Key;
+							bool createCallback;
+							if (JNIEnv.MarshalMethodsEnabled) {
+								string declaringTypeName = callbackDeclaringType.FullName;
+								string callbackName = callbackString.ToString ();
+
+								createCallback = false;
+								foreach (var kvp in dynamicRegistrationMethods) {
+									string dynamicTypeName = kvp.Key;
+
+									foreach (string dynamicCallbackMethodName in kvp.Value) {
+										if (ShouldRegisterDynamically (declaringTypeName, callbackName, dynamicTypeName, dynamicCallbackMethodName)) {
+											createCallback = true;
+											break;
+										}
+									}
 
-								foreach (string dynamicCallbackMethodName in kvp.Value) {
-									if (ShouldRegisterDynamically (declaringTypeName, callbackName, dynamicTypeName, dynamicCallbackMethodName)) {
-										createCallback = true;
+									if (createCallback) {
 										break;
 									}
 								}
-
-								if (createCallback) {
-									break;
-								}
+							} else {
+								createCallback = true;
 							}
 
 							if (createCallback) {
 								Logger.Log (LogLevel.Info, "monodroid-mm", $"  creating delegate for: '{callbackString.ToString()}' in type {callbackDeclaringType.FullName}");
-#endif
 								GetCallbackHandler connector = (GetCallbackHandler) Delegate.CreateDelegate (typeof (GetCallbackHandler),
 								                                                                             callbackDeclaringType, callbackString.ToString ());
 								callback = connector ();
-#if ENABLE_MARSHAL_METHODS
-							} else {
-								Logger.Log (LogLevel.Warn, "monodroid-mm", $"  would try to create delegate for: '{callbackString.ToString()}' in type {callbackDeclaringType.FullName}");
 							}
-#endif
 						}
 
 						if (callback != null) {
-#if ENABLE_MARSHAL_METHODS
 							needToRegisterNatives = true;
-#endif
 							natives [nativesIndex++] = new JniNativeMethodRegistration (name.ToString (), signature.ToString (), callback);
 						}
 					}
 
 					methodsSpan = newLineIndex != -1 ? methodsSpan.Slice (newLineIndex + 1) : default;
 				}
 
-#if ENABLE_MARSHAL_METHODS
 				if (needToRegisterNatives) {
-#endif
 					JniEnvironment.Types.RegisterNatives (nativeClass.PeerReference, natives, nativesIndex);
-#if ENABLE_MARSHAL_METHODS
 				}
-#endif
 			} catch (Exception e) {
 				JniEnvironment.Runtime.RaisePendingException (e);
 			}
 
-#if ENABLE_MARSHAL_METHODS
 			bool ShouldRegisterDynamically (string callbackTypeName, string callbackString, string typeName, string callbackName)
 			{
 				if (String.Compare (typeName, callbackTypeName, StringComparison.Ordinal) != 0) {
@@ -622,7 +602,6 @@ bool ShouldRegisterDynamically (string callbackTypeName, string callbackString,
 
 				return String.Compare (callbackName, callbackString, StringComparison.Ordinal) == 0;
 			}
-#endif
 		}
 
 		static int CountMethods (ReadOnlySpan<char> methodsSpan)

src/Mono.Android/Android.Runtime/JNIEnv.cs

@@ -34,6 +34,7 @@ struct JnienvInitializeArgs {
 		public byte            ioExceptionType;
 		public int             jniAddNativeMethodRegistrationAttributePresent;
 		public bool            jniRemappingInUse;
+		public bool            marshalMethodsEnabled;
 	}
 #pragma warning restore 0649
 
@@ -57,6 +58,7 @@ public static partial class JNIEnv {
 
 		internal static bool IsRunningOnDesktop;
 		internal static bool LogAssemblyCategory;
+		internal static bool MarshalMethodsEnabled;
 
 		static AndroidRuntime? androidRuntime;
 		static BoundExceptionType BoundExceptionType;
@@ -156,6 +158,9 @@ internal static unsafe void Initialize (JnienvInitializeArgs* args)
 			gref_gc_threshold = args->grefGcThreshold;
 
 			jniRemappingInUse = args->jniRemappingInUse;
+#if NETCOREAPP
+			MarshalMethodsEnabled = args->marshalMethodsEnabled;
+#endif
 			java_vm = args->javaVm;
 
 			version = args->version;

src/Mono.Android/Java.Interop/TypeManager.cs

@@ -418,6 +418,13 @@ static void n_Activate (IntPtr jnienv, IntPtr jclass, IntPtr typename_ptr, IntPt
 				TypeManager.n_Activate (jnienv, jclass, typename_ptr, signature_ptr, jobject, parameters_ptr);
 			}
 
+#if NETCOREAPP
+			[UnmanagedCallersOnly]
+			static void n_Activate_mm (IntPtr jnienv, IntPtr jclass, IntPtr typename_ptr, IntPtr signature_ptr, IntPtr jobject, IntPtr parameters_ptr)
+			{
+				TypeManager.n_Activate (jnienv, jclass, typename_ptr, signature_ptr, jobject, parameters_ptr);
+			}
+#endif
 			internal static Delegate GetActivateHandler ()
 			{
 				return TypeManager.GetActivateHandler ();

src/Mono.Android/java/mono/android/TypeManager.java

@@ -9,10 +9,12 @@ public static void Activate (String typeName, String sig, Object instance, Objec
 
 	private static native void n_activate (String typeName, String sig, Object instance, Object[] parameterList);
 
+//#MARSHAL_METHODS:START - do not remove or modify this line, it is required during application build
 	static {
 		String methods = 
 			"n_activate:(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)V:GetActivateHandler\n" +
 			"";
 		mono.android.Runtime.register ("Java.Interop.TypeManager+JavaTypeManager, Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", TypeManager.class, methods);
 	}
+//#MARSHAL_METHODS:END - do not remove or modify this line, it is required during application build
 }

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Aapt2.targets

@@ -208,7 +208,9 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
     <_ProtobufFormat Condition=" '$(AndroidPackageFormat)' == 'aab' ">True</_ProtobufFormat>
     <_ProtobufFormat Condition=" '$(_ProtobufFormat)' == '' ">False</_ProtobufFormat>
     <_Aapt2ProguardRules Condition=" '$(AndroidLinkTool)' != '' ">$(IntermediateOutputPath)aapt_rules.txt</_Aapt2ProguardRules>
+    <_OutputFileDir>$([System.IO.Path]::GetDirectoryName ('$(_PackagedResources)'))</_OutputFileDir>
   </PropertyGroup>
+  <MakeDir Directories="$(_OutputFileDir)" Condition=" !Exists ('$(_OutputFileDir)') " />
   <Aapt2Link
       AndroidManifestFile="$(_AndroidManifestAbs)"
       CompiledResourceFlatFiles="@(_CompiledFlatFiles)"

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets

@@ -48,8 +48,27 @@ They run in a context of an inner build with a single $(RuntimeIdentifier).
       <FileWrites Include="@(_AotCompiledAssemblies)" />
       <ResolvedFileToPublish
           Include="@(_AotCompiledAssemblies)"
+          Condition=" '$(_AndroidUseMarshalMethods)' != 'True' "
           ArchiveFileName="libaot-$([System.IO.Path]::GetFileNameWithoutExtension('%(_AotCompiledAssemblies.Identity)')).so"
       />
+      <_AotResolvedFileToPublish
+          Include="@(_AotCompiledAssemblies)"
+          Condition=" '$(_AndroidUseMarshalMethods)' == 'True' "
+          ArchiveFileName="libaot-$([System.IO.Path]::GetFileNameWithoutExtension('%(_AotCompiledAssemblies.Identity)')).so"
+      />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_AndroidAotAndComputeFilesToPublishForRuntimeIdentifiers"
+          DependsOnTargets="_AndroidAot"
+          Returns="@(_AotResolvedFileToPublish)">
+    <ItemGroup>
+      <_AotResolvedFileToPublish Remove="@(_SourceItemsToCopyToPublishDirectory)" />
+      <_AotResolvedFileToPublish
+          Condition=" '%(_AotResolvedFileToPublish.RuntimeIdentifier)' == '' "
+          Update="@(_AotResolvedFileToPublish)"
+          RuntimeIdentifier="$(RuntimeIdentifier)"
+      />
     </ItemGroup>
   </Target>
 

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets

@@ -38,8 +38,13 @@ _ResolveAssemblies MSBuild target.
     </CompileDependsOn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- When marshal methods are enabled, AOT needs to run after the GenerateJavaStubs task -->
+    <_RunAotMaybe Condition=" '$(_AndroidUseMarshalMethods)' != 'True' ">_AndroidAot</_RunAotMaybe>
+  </PropertyGroup>
+
   <Target Name="_ComputeFilesToPublishForRuntimeIdentifiers"
-      DependsOnTargets="_FixupIntermediateAssembly;ResolveReferences;ComputeFilesToPublish;_AndroidAot"
+      DependsOnTargets="_FixupIntermediateAssembly;ResolveReferences;ComputeFilesToPublish;$(_RunAotMaybe)"
       Returns="@(ResolvedFileToPublish)">
       <ItemGroup>
         <ResolvedFileToPublish Remove="@(_SourceItemsToCopyToPublishDirectory)" />

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

@@ -0,0 +1,79 @@
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System;
+
+using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
+
+namespace Xamarin.Android.Tasks
+{
+	public class CreateTypeManagerJava : AndroidTask
+	{
+		public override string TaskPrefix => "CTMJ";
+
+		[Required]
+		public string ResourceName { get; set; }
+
+		[Required]
+		public string OutputFilePath { get; set; }
+
+		static readonly Assembly ExecutingAssembly = Assembly.GetExecutingAssembly ();
+
+		public override bool RunTask ()
+		{
+			string? content = ReadResource (ResourceName);
+
+			if (String.IsNullOrEmpty (content)) {
+				return false;
+			}
+
+			var result = new StringBuilder ();
+			bool ignoring = false;
+			foreach (string line in content.Split ('\n')) {
+				if (!ignoring) {
+					if (ignoring = line.StartsWith ("//#MARSHAL_METHODS:START", StringComparison.Ordinal)) {
+						continue;
+					}
+					result.AppendLine (line);
+				} else if (line.StartsWith ("//#MARSHAL_METHODS:END", StringComparison.Ordinal)) {
+					ignoring = false;
+				}
+			}
+
+			if (result.Length == 0) {
+				Log.LogDebugMessage ("TypeManager.java not generated, empty resource data");
+				return false;
+			}
+
+			using (var ms = new MemoryStream ()) {
+				using (var sw = new StreamWriter (ms)) {
+					sw.Write (result.ToString ());
+					sw.Flush ();
+
+					if (Files.CopyIfStreamChanged (ms, OutputFilePath)) {
+						Log.LogDebugMessage ($"Wrote resource {OutputFilePath}.");
+					} else {
+						Log.LogDebugMessage ($"Resource {OutputFilePath} is unchanged. Skipping.");
+					}
+				}
+			}
+
+			return !Log.HasLoggedErrors;
+		}
+
+		string? ReadResource (string resourceName)
+		{
+			using (var from = ExecutingAssembly.GetManifestResourceStream (resourceName)) {
+				if (from == null) {
+					Log.LogCodedError ("XA0116", Properties.Resources.XA0116, resourceName);
+					return null;
+				}
+
+				using (var sr = new StreamReader (from)) {
+					return sr.ReadToEnd ();
+				}
+			}
+		}
+	}
+}