Fixes after rebase on main

Author: grendello

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

@@ -38,13 +38,14 @@ public void ProcessAssembly (AssemblyDefinition assembly, StepContext context)
 
 		var xml = new TypeMapObjectsXmlFile {
 			AssemblyName = assembly.Name.Name,
+			AssemblyMvid = assembly.MainModule.Mvid,
 		};
 
 		if (Debug) {
-			var (javaToManaged, managedToJava, foundJniNativeRegistration) = TypeMapCecilAdapter.GetDebugNativeEntries (types, Context);
+			var (typeMapDebugSets, foundJniNativeRegistration) = TypeMapCecilAdapter.GetDebugNativeEntries (types, Context, needUniqueAssemblies: false);
 
-			xml.JavaToManagedDebugEntries.AddRange (javaToManaged);
-			xml.ManagedToJavaDebugEntries.AddRange (managedToJava);
+			xml.JavaToManagedDebugEntries.AddRange (typeMapDebugSets.JavaToManaged);
+			xml.ManagedToJavaDebugEntries.AddRange (typeMapDebugSets.ManagedToJava);
 			xml.FoundJniNativeRegistration = foundJniNativeRegistration;
 		} else {
 			var genState = TypeMapCecilAdapter.GetReleaseGenerationState (types, Context, out var foundJniNativeRegistration);

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

@@ -26,6 +26,7 @@ class TypeMapObjectsXmlFile
 	static readonly TypeMapObjectsXmlFile unscanned = new TypeMapObjectsXmlFile { WasScanned = false };
 
 	public string? AssemblyName { get; set; }
+	public Guid AssemblyMvid { get; set; } = Guid.Empty;
 	public bool FoundJniNativeRegistration { get; set; }
 	public List<TypeMapDebugEntry> JavaToManagedDebugEntries { get; } = [];
 	public List<TypeMapDebugEntry> ManagedToJavaDebugEntries { get; } = [];
@@ -59,6 +60,10 @@ void Export (XmlWriter xml)
 		xml.WriteStartElement ("api");
 		xml.WriteAttributeString ("type", HasDebugEntries ? "debug" : "release");
 		xml.WriteAttributeStringIfNotDefault ("assembly-name", AssemblyName);
+
+		if (AssemblyMvid != Guid.Empty) {
+			xml.WriteAttributeString ("mvid", AssemblyMvid.ToString ("N"));
+		}
 		xml.WriteAttributeStringIfNotDefault ("found-jni-native-registration", FoundJniNativeRegistration);
 
 		if (HasDebugEntries)
@@ -174,11 +179,13 @@ public static TypeMapObjectsXmlFile Import (string filename)
 
 		var type = root.GetRequiredAttribute ("type");
 		var assemblyName = root.GetAttributeOrDefault ("assembly-name", (string?)null);
+		var mvid = Guid.Parse (root.GetAttributeOrDefault ("mvid", Guid.Empty.ToString ()));
 		var foundJniNativeRegistration = root.GetAttributeOrDefault ("found-jni-native-registration", false);
 
 		var file = new TypeMapObjectsXmlFile {
 			WasScanned = true,
 			AssemblyName = assemblyName,
+			AssemblyMvid = mvid,
 			FoundJniNativeRegistration = foundJniNativeRegistration,
 		};