Move marshal method pipeline from outer build to inner (per-RID) build

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs

@@ -22,8 +22,6 @@ public class FindJavaObjectsStep : BaseStep, IAssemblyModifierPipelineStep
 
 	public bool ErrorOnCustomJavaObject { get; set; }
 
-	public bool UseMarshalMethods { get; set; }
-
 	public TaskLoggingHelper Log { get; set; }
 
 	public FindJavaObjectsStep (TaskLoggingHelper log) => Log = log;
@@ -114,11 +112,6 @@ List<CallableWrapperType> ConvertToCallableWrappers (List<TypeDefinition> types)
 			DefaultMonoRuntimeInitialization = "mono.MonoPackageManager.LoadApplication (context);",
 		};
 
-		if (UseMarshalMethods) {
-			var classifier = new MarshalMethodsClassifier (Context, Context.Resolver, Log);
-			reader_options.MethodClassifier = new MarshalMethodsCollection (classifier);
-		}
-
 		foreach (var type in types) {
 			var wrapper = CecilImporter.CreateType (type, Context, reader_options);
 			wrappers.Add (wrapper);

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets

@@ -83,13 +83,6 @@
         EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)">
     </GenerateJavaStubs>
 
-    <RewriteMarshalMethods
-        Condition=" '$(_AndroidUseMarshalMethods)' == 'true' And '$(AndroidIncludeDebugSymbols)' == 'false' "
-        EnableManagedMarshalMethodsLookup="$(_AndroidUseManagedMarshalMethodsLookup)"
-        Environments="@(_EnvironmentFiles)"
-        IntermediateOutputDirectory="$(IntermediateOutputPath)">
-    </RewriteMarshalMethods>
-
     <GenerateTypeMappings
         AndroidRuntime="$(_AndroidRuntime)"
         Debug="$(AndroidIncludeDebugSymbols)"
@@ -132,6 +125,7 @@
     <GenerateAdditionalProviderSources
         AdditionalProviderSources="@(_AdditionalProviderSources)"
         AndroidRuntime="$(_AndroidRuntime)"
+        EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
         Environments="@(_EnvironmentFiles)"
         HttpClientHandlerType="$(AndroidHttpClientHandlerType)"
         EnableSGenConcurrent="$(AndroidEnableSGenConcurrent)"

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

@@ -134,7 +134,6 @@ protected virtual void BuildPipeline (AssemblyPipeline pipeline, MSBuildLinkCont
 		var findJavaObjectsStep = new FindJavaObjectsStep (Log) {
 			ApplicationJavaClass = ApplicationJavaClass,
 			ErrorOnCustomJavaObject = ErrorOnCustomJavaObject,
-			UseMarshalMethods = EnableMarshalMethods,
 		};
 
 		findJavaObjectsStep.Initialize (context);

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

@@ -38,6 +38,13 @@ public sealed class GenerateAdditionalProviderSources : AndroidTask
 	public string? HttpClientHandlerType { get; set; }
 	public bool EnableSGenConcurrent { get; set; }
 
+	/// <summary>
+	/// When true, <c>ApplicationRegistration.java</c> is generated by the inner build's
+	/// <see cref="RewriteMarshalMethods"/> task (which has the classifier to filter types).
+	/// This task skips generating it to avoid overwriting the inner build's output.
+	/// </summary>
+	public bool EnableMarshalMethods { get; set; }
+
 	AndroidRuntime androidRuntime;
 	JavaPeerStyle codeGenerationTarget;
 
@@ -90,29 +97,34 @@ void Generate (NativeCodeGenStateObject codeGenState)
 		}
 
 		// Create additional application java sources.
-		StringWriter regCallsWriter = new StringWriter ();
-		regCallsWriter.WriteLine ("// Application and Instrumentation ACWs must be registered first.");
-
-		foreach ((string jniName, string assemblyQualifiedName) in codeGenState.ApplicationsAndInstrumentationsToRegister) {
-			regCallsWriter.WriteLine (
-				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);",
-				assemblyQualifiedName,
-				jniName
-			);
-		}
+		// When marshal methods are enabled, ApplicationRegistration.java is generated
+		// by RewriteMarshalMethods in the inner build, which has the classifier to
+		// filter out types with no dynamically registered methods.
+		if (!EnableMarshalMethods) {
+			StringWriter regCallsWriter = new StringWriter ();
+			regCallsWriter.WriteLine ("// Application and Instrumentation ACWs must be registered first.");
+
+			foreach ((string jniName, string assemblyQualifiedName) in codeGenState.ApplicationsAndInstrumentationsToRegister) {
+				regCallsWriter.WriteLine (
+					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);",
+					assemblyQualifiedName,
+					jniName
+				);
+			}
 
-		regCallsWriter.Close ();
+			regCallsWriter.Close ();
 
-		var real_app_dir = Path.Combine (OutputDirectory, "src", "net", "dot", "android");
-		string applicationTemplateFile = "ApplicationRegistration.java";
-		SaveResource (
-			applicationTemplateFile,
-			applicationTemplateFile,
-			real_app_dir,
-			template => template.Replace ("// REGISTER_APPLICATION_AND_INSTRUMENTATION_CLASSES_HERE", regCallsWriter.ToString ())
-		);
+			var real_app_dir = Path.Combine (OutputDirectory, "src", "net", "dot", "android");
+			string applicationTemplateFile = "ApplicationRegistration.java";
+			SaveResource (
+				applicationTemplateFile,
+				applicationTemplateFile,
+				real_app_dir,
+				template => template.Replace ("// REGISTER_APPLICATION_AND_INSTRUMENTATION_CLASSES_HERE", regCallsWriter.ToString ())
+			);
+		}
 
 	}
 

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

@@ -206,12 +206,10 @@ internal static Dictionary<string, ITaskItem> MaybeGetArchAssemblies (Dictionary
 			var tdCache = new TypeDefinitionCache ();
 			(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) = ScanForJavaTypes (resolver, tdCache, assemblies, userAssemblies, useMarshalMethods);
 
-			MarshalMethodsCollection? marshalMethodsCollection = null;
-
-			if (useMarshalMethods)
-				marshalMethodsCollection = MarshalMethodsCollection.FromAssemblies (arch, assemblies.Values.ToList (), resolver, Log);
-
-			return new NativeCodeGenState (arch, tdCache, resolver, allJavaTypes, javaTypesForJCW, marshalMethodsCollection);
+			// Marshal method classification is now done in the inner build by
+			// RewriteMarshalMethods, so we never classify here.  The NativeCodeGenState
+			// will have a null Classifier; downstream tasks must handle that.
+			return new NativeCodeGenState (arch, tdCache, resolver, allJavaTypes, javaTypesForJCW, classifier: null);
 		}
 
 		(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) ScanForJavaTypes (XAAssemblyResolver res, TypeDefinitionCache cache, Dictionary<string, ITaskItem> assemblies, Dictionary<string, ITaskItem> userAssemblies, bool useMarshalMethods)