Fix after rebase

Author: grendello

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

@@ -25,7 +25,6 @@ public class GenerateMainAndroidManifest : AndroidTask
 	public string? CheckedBuild { get; set; }
 	public bool Debug { get; set; }
 	public bool EmbedAssemblies { get; set; }
-	public bool EnableMarshalMethods { get; set; }
 	public bool EnableNativeRuntimeLinking { get; set; }
 	[Required]
 	public string IntermediateOutputDirectory { get; set; } = "";
@@ -66,10 +65,9 @@ public override bool RunTask ()
 
 		AdditionalProviderSources = additionalProviders.ToArray ();
 
-		// If we still need the NativeCodeGenState in the <GenerateNativeMarshalMethodSources> task because we're using marshal methods,
-		// we're going to transfer it to a new object that doesn't require holding open Cecil AssemblyDefinitions.
-		if (UseMarshalMethods || EnableNativeRuntimeLinking) {
-			var nativeCodeGenStateObject = MarshalMethodCecilAdapter.GetNativeCodeGenStateCollection (Log, nativeCodeGenStates);
+		// We still need the NativeCodeGenState for later tasks, but we're going to transfer
+		// it to a new object that doesn't require holding open Cecil AssemblyDefinitions.
+		var nativeCodeGenStateObject = MarshalMethodCecilAdapter.GetNativeCodeGenStateCollection (Log, nativeCodeGenStates);
 
 		Log.LogDebugMessage ($"Saving {nameof (NativeCodeGenStateObject)} to {nameof (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey)}");
 		BuildEngine4.RegisterTaskObjectAssemblyLocal (MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateObjectRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory), nativeCodeGenStateObject, RegisteredTaskObjectLifetime.Build);

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

@@ -160,6 +160,7 @@ class NativeCodeGenStateObject
 	public Dictionary<string, IList<MarshalMethodEntryObject>> MarshalMethods { get; } = [];
 	public List<PinvokeScanner.PinvokeEntryInfo>? PinvokeInfos                { get; set; }
 	public AndroidTargetArch TargetArch                                       { get; set; } = AndroidTargetArch.None;
+	public List<(string JniName, string AssemblyQualifiedName)> ApplicationsAndInstrumentationsToRegister { get; } = [];
 }
 
 class MarshalMethodEntryObject

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

@@ -1660,7 +1660,6 @@ because xbuild doesn't support framework reference assemblies.
       CheckedBuild="$(_AndroidCheckedBuild)"
       Debug="$(AndroidIncludeDebugSymbols)"
       EmbedAssemblies="$(EmbedAssembliesIntoApk)"
-      EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       EnableNativeRuntimeLinking="$(_AndroidEnableNativeRuntimeLinking)"
       IntermediateOutputDirectory="$(IntermediateOutputPath)"
       ManifestPlaceholders="$(AndroidManifestPlaceholders)"