Address review feedback.

Author: jpobst

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

@@ -41,31 +41,17 @@ public void ProcessAssembly (AssemblyDefinition assembly, StepContext context)
 		};
 
 		if (Debug) {
-			var (javaToManaged, managedToJava) = TypeMapCecilAdapter.GetDebugNativeEntries (types, Context, out var foundJniNativeRegistration);
+			var (javaToManaged, managedToJava, foundJniNativeRegistration) = TypeMapCecilAdapter.GetDebugNativeEntries (types, Context);
 
 			xml.JavaToManagedDebugEntries.AddRange (javaToManaged);
 			xml.ManagedToJavaDebugEntries.AddRange (managedToJava);
 			xml.FoundJniNativeRegistration = foundJniNativeRegistration;
-
-			if (!xml.HasDebugEntries) {
-				Log.LogDebugMessage ($"No Java types found in '{assembly.Name.Name}'");
-				TypeMapObjectsXmlFile.WriteEmptyFile (destinationTypeMapXml, Log);
-				return;
-			}
 		} else {
 			var genState = TypeMapCecilAdapter.GetReleaseGenerationState (types, Context, out var foundJniNativeRegistration);
 			xml.ModuleReleaseData = genState.TempModules.SingleOrDefault ().Value;
-
-			if (xml.ModuleReleaseData == null) {
-				Log.LogDebugMessage ($"No Java types found in '{assembly.Name.Name}'");
-				TypeMapObjectsXmlFile.WriteEmptyFile (destinationTypeMapXml, Log);
-				return;
-			}
 		}
 
-		xml.Export (destinationTypeMapXml);
-
-		Log.LogDebugMessage ($"Wrote '{destinationTypeMapXml}', {xml.JavaToManagedDebugEntries.Count} JavaToManagedDebugEntries, {xml.ManagedToJavaDebugEntries.Count} ManagedToJavaDebugEntries, FoundJniNativeRegistration: {xml.FoundJniNativeRegistration}");
+		xml.Export (destinationTypeMapXml, Log);
 	}
 
 	List<TypeDefinition> ScanForJavaTypes (AssemblyDefinition assembly)

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

@@ -16,19 +16,19 @@ class TypeMapCecilAdapter
 {
 	public static (List<TypeMapDebugEntry> javaToManaged, List<TypeMapDebugEntry> managedToJava) GetDebugNativeEntries (NativeCodeGenState state)
 	{
-		var (javaToManaged, managedToJava) = GetDebugNativeEntries (state.AllJavaTypes, state.TypeCache, out var foundJniNativeRegistration);
+		var (javaToManaged, managedToJava, foundJniNativeRegistration) = GetDebugNativeEntries (state.AllJavaTypes, state.TypeCache);
 
 		state.JniAddNativeMethodRegistrationAttributePresent = foundJniNativeRegistration;
 
 		return (javaToManaged, managedToJava);
 	}
 
-	public static (List<TypeMapDebugEntry> javaToManaged, List<TypeMapDebugEntry> managedToJava) GetDebugNativeEntries (List<TypeDefinition> types, TypeDefinitionCache cache, out bool foundJniNativeRegistration)
+	public static (List<TypeMapDebugEntry> javaToManaged, List<TypeMapDebugEntry> managedToJava, bool foundJniNativeRegistration) GetDebugNativeEntries (List<TypeDefinition> types, TypeDefinitionCache cache)
 	{
 		var javaDuplicates = new Dictionary<string, List<TypeMapDebugEntry>> (StringComparer.Ordinal);
 		var javaToManaged = new List<TypeMapDebugEntry> ();
 		var managedToJava = new List<TypeMapDebugEntry> ();
-		foundJniNativeRegistration = false;
+		var foundJniNativeRegistration = false;
 
 		foreach (var td in types) {
 			foundJniNativeRegistration = JniAddNativeMethodRegistrationAttributeFound (foundJniNativeRegistration, td);
@@ -42,7 +42,7 @@ public static (List<TypeMapDebugEntry> javaToManaged, List<TypeMapDebugEntry> ma
 
 		SyncDebugDuplicates (javaDuplicates);
 
-		return (javaToManaged, managedToJava);
+		return (javaToManaged, managedToJava, foundJniNativeRegistration);
 	}
 
 	public static ReleaseGenerationState GetReleaseGenerationState (NativeCodeGenState state)

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

@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tasks;
 
 class TypeMapObjectsXmlFile
 {
-	static XmlWriterSettings settings = new XmlWriterSettings {
+	static readonly XmlWriterSettings settings = new XmlWriterSettings {
 		Indent = true,
 		NewLineOnAttributes = false,
 		OmitXmlDeclaration = true,
@@ -35,8 +35,13 @@ class TypeMapObjectsXmlFile
 
 	public bool WasScanned { get; private set; }
 
-	public void Export (string filename)
+	public void Export (string filename, TaskLoggingHelper log)
 	{
+		if (!HasDebugEntries && ModuleReleaseData == null) {
+			WriteEmptyFile (filename, log);
+			return;
+		}
+
 		using var sw = MemoryStreamPool.Shared.CreateStreamWriter ();
 
 		using (var xml = XmlWriter.Create (sw, settings))
@@ -45,6 +50,8 @@ public void Export (string filename)
 		sw.Flush ();
 
 		Files.CopyIfStreamChanged (sw.BaseStream, filename);
+
+		log.LogDebugMessage ($"Wrote '{filename}', {JavaToManagedDebugEntries.Count} JavaToManagedDebugEntries, {ManagedToJavaDebugEntries.Count} ManagedToJavaDebugEntries, FoundJniNativeRegistration: {FoundJniNativeRegistration}");
 	}
 
 	void Export (XmlWriter xml)