[XABT] Move scanning for ACW map JLOs to FindJavaObjectsStep.

Author: jpobst

external/Java.Interop

@@ -40,23 +40,20 @@ public bool ProcessAssembly (AssemblyDefinition assembly, string destinationJLOX
 		var initial_count = types.Count;
 
 		// Filter out Java types we don't care about
-		types = types.Where (t => !t.IsInterface && !JavaTypeScanner.ShouldSkipJavaCallableWrapperGeneration (t, Context)).ToList ();
+		types = types.Where (t => !JavaTypeScanner.ShouldSkipJavaCallableWrapperGeneration (t, Context)).ToList ();
 
 		Log.LogDebugMessage ($"{assembly.Name.Name} - Found {initial_count} Java types, filtered to {types.Count}");
 
-		var wrappers = ConvertToCallableWrappers (types);
+		var xml = new JavaObjectsXmlFile ();
 
-		using (var sw = MemoryStreamPool.Shared.CreateStreamWriter ()) {
-			XmlExporter.Export (sw, wrappers, true);
-			Files.CopyIfStreamChanged (sw.BaseStream, destinationJLOXml);
-		}
+		xml.ACWMapEntries.AddRange (types.Select (t => ACWMapEntry.Create (t, Context)));
+		xml.JavaCallableWrappers.AddRange (ConvertToCallableWrappers (types.Where (t => !t.IsInterface).ToList ()));
 
-		return true;
-	}
+		xml.Export (destinationJLOXml);
 
-	public static void WriteEmptyXmlFile (string destination)
-	{
-		XmlExporter.Export (destination, [], false);
+		Log.LogDebugMessage ($"Wrote '{destinationJLOXml}', {xml.JavaCallableWrappers.Count} JCWs, {xml.ACWMapEntries.Count} ACWs");
+
+		return true;
 	}
 
 	List<TypeDefinition> ScanForJavaTypes (AssemblyDefinition assembly)
@@ -88,10 +85,8 @@ List<CallableWrapperType> ConvertToCallableWrappers (List<TypeDefinition> types)
 		if (UseMarshalMethods)
 			reader_options.MethodClassifier = new MarshalMethodsClassifier (Context, Context.Resolver, Log);
 
-		foreach (var type in types) {
-			var wrapper = CecilImporter.CreateType (type, Context, reader_options);
-			wrappers.Add (wrapper);
-		}
+		foreach (var type in types)
+			wrappers.Add (CecilImporter.CreateType (type, Context, reader_options));
 
 		return wrappers;
 	}

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

@@ -147,11 +147,11 @@ protected virtual void CreateRunState (RunState runState, MSBuildLinkContext con
 
 	protected virtual void RunPipeline (ITaskItem source, ITaskItem destination, RunState runState, WriterParameters writerParameters)
 	{
-		var destinationJLOXml = Path.ChangeExtension (destination.ItemSpec, ".jlo.xml");
+		var destinationJLOXml = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (destination.ItemSpec);
 
 		if (!TryScanForJavaObjects (source, destination, runState, writerParameters)) {
 			// Even if we didn't scan for Java objects, we still write an empty .xml file for later steps
-			FindJavaObjectsStep.WriteEmptyXmlFile (destinationJLOXml);
+			JavaObjectsXmlFile.WriteEmptyFile (destinationJLOXml, Log);
 		}
 	}
 
@@ -160,7 +160,7 @@ bool TryScanForJavaObjects (ITaskItem source, ITaskItem destination, RunState ru
 		if (!ShouldScanAssembly (source))
 			return false;
 
-		var destinationJLOXml = Path.ChangeExtension (destination.ItemSpec, ".jlo.xml");
+		var destinationJLOXml = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (destination.ItemSpec);
 		var assemblyDefinition = runState.resolver!.GetAssembly (source.ItemSpec);
 
 		var scanned = runState.findJavaObjectsStep!.ProcessAssembly (assemblyDefinition, destinationJLOXml);

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

@@ -1,5 +1,7 @@
 #nullable enable
 using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
@@ -17,29 +19,68 @@ public class GenerateACWMap : AndroidTask
 	[Required]
 	public string IntermediateOutputDirectory { get; set; } = "";
 
+	[Required]
+	public ITaskItem [] ResolvedAssemblies { get; set; } = [];
+
+	// This property is temporary and is used to ensure that the new "linker step"
+	// JLO scanning produces the same results as the old process. It will be removed
+	// once the process is complete.
+	public bool RunCheckedBuild { get; set; }
+
+	[Required]
+	public string [] SupportedAbis { get; set; } = [];
+
 	public override bool RunTask ()
 	{
-		// Retrieve the stored NativeCodeGenState
-		var nativeCodeGenStates = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>> (
-			MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
-			RegisteredTaskObjectLifetime.Build
-		);
+		// Temporarily used to ensure we still generate the same as the old code
+		if (RunCheckedBuild) {
+			// Retrieve the stored NativeCodeGenState
+			var nativeCodeGenStates = BuildEngine4.GetRegisteredTaskObjectAssemblyLocal<ConcurrentDictionary<AndroidTargetArch, NativeCodeGenState>> (
+				MonoAndroidHelper.GetProjectBuildSpecificTaskObjectKey (GenerateJavaStubs.NativeCodeGenStateRegisterTaskKey, WorkingDirectory, IntermediateOutputDirectory),
+				RegisteredTaskObjectLifetime.Build
+			);
 
-		// We only need the first architecture, since this task is architecture-agnostic
-		var templateCodeGenState = nativeCodeGenStates.First ().Value;
+			// We only need the first architecture, since this task is architecture-agnostic
+			var templateCodeGenState = nativeCodeGenStates.First ().Value;
 
-		var acwMapGen = new ACWMapGenerator (Log);
+			var acwMapGen = new ACWMapGenerator (Log);
 
-		if (!acwMapGen.Generate (templateCodeGenState, AcwMapFile)) {
-			Log.LogDebugMessage ("ACW map generation failed");
-		}
+			if (!acwMapGen.Generate (templateCodeGenState, AcwMapFile)) {
+				Log.LogDebugMessage ("ACW map generation failed");
+			}
 
-		if (Log.HasLoggedErrors) {
-			// Ensure that on a rebuild, we don't *skip* the `_GenerateJavaStubs` target,
-			// by ensuring that the target outputs have been deleted.
-			Files.DeleteFile (AcwMapFile, Log);
+			return !Log.HasLoggedErrors;
 		}
 
+		GenerateMap ();
+
 		return !Log.HasLoggedErrors;
 	}
+
+	void GenerateMap ()
+	{
+		// Get the set of assemblies for the "first" ABI. The ACW map is
+		// not ABI-specific, so we can use any ABI to generate the wrappers.
+		var allAssembliesPerArch = MonoAndroidHelper.GetPerArchAssemblies (ResolvedAssemblies, SupportedAbis, validate: true);
+		var singleArchAssemblies = allAssembliesPerArch.First ().Value.Values.ToList ();
+
+		var entries = new List<ACWMapEntry> ();
+
+		foreach (var assembly in singleArchAssemblies) {
+			var wrappersPath = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (assembly.ItemSpec);
+
+			if (!File.Exists (wrappersPath)) {
+				Log.LogError ($"'{wrappersPath}' not found.");
+				return;
+			}
+
+			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.ACW);
+
+			entries.AddRange (xml.ACWMapEntries);
+		}
+
+		var acwMapGen = new ACWMapGenerator (Log);
+
+		acwMapGen.Generate (entries, AcwMapFile);
+	}
 }

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

@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using Java.Interop.Tools.JavaCallableWrappers;
-using Java.Interop.Tools.JavaCallableWrappers.Adapters;
 using Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
 using Java.Interop.Tools.TypeNameMappings;
 using Microsoft.Android.Build.Tasks;
@@ -63,16 +62,21 @@ void GenerateWrappers (List<ITaskItem> assemblies)
 		var sw = Stopwatch.StartNew ();
 
 		foreach (var assembly in assemblies) {
-			var assemblyPath = assembly.ItemSpec;
-			var assemblyName = Path.GetFileNameWithoutExtension (assemblyPath);
-			var wrappersPath = Path.Combine (Path.GetDirectoryName (assemblyPath), $"{assemblyName}.jlo.xml");
+			var wrappersPath = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (assembly.ItemSpec);
 
 			if (!File.Exists (wrappersPath)) {
 				Log.LogError ($"'{wrappersPath}' not found.");
 				return;
 			}
 
-			wrappers.AddRange (XmlImporter.Import (wrappersPath, out var _));
+			var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.JCW);
+
+			if (xml.JavaCallableWrappers.Count == 0) {
+				Log.LogDebugMessage ($"'{wrappersPath}' is empty, skipping.");
+				continue;
+			}
+
+			wrappers.AddRange (xml.JavaCallableWrappers);
 		}
 
 		Log.LogDebugMessage ($"Deserialized {wrappers.Count} Java callable wrappers in {sw.ElapsedMilliseconds}ms");

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

@@ -277,15 +277,14 @@ void CompareScannedAssemblies ()
 			// Find every assembly that was scanned by the linker by looking at the .jlo.xml files
 			foreach (var assembly in ResolvedAssemblies) {
 				var assemblyPath = assembly.ItemSpec;
-				var assemblyName = Path.GetFileNameWithoutExtension (assemblyPath);
-				var wrappersPath = Path.Combine (Path.GetDirectoryName (assemblyPath), $"{assemblyName}.jlo.xml");
+				var wrappersPath = JavaObjectsXmlFile.GetJavaObjectsXmlFilePath (assembly.ItemSpec);
 
 				if (!File.Exists (wrappersPath))
 					Log.LogError ($"'{wrappersPath}' not found.");
 
-				XmlImporter.Import (wrappersPath, out var wasScanned);
+				var xml = JavaObjectsXmlFile.Import (wrappersPath, JavaObjectsXmlFileReadType.None);
 
-				if (wasScanned) {
+				if (xml.WasScanned) {
 					Log.LogDebugMessage ($"CompareScannedAssemblies: Found scanned assembly .jlo.xml '{assemblyPath}'");
 					linker_scanned_assemblies.Add (assembly.ItemSpec);
 				}

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

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
-
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
 using Java.Interop.Tools.Cecil;
 using Java.Interop.Tools.TypeNameMappings;
 using Microsoft.Android.Build.Tasks;
@@ -33,7 +35,7 @@ public bool Generate (NativeCodeGenState codeGenState, string acwMapFile)
 		bool success = true;
 
 		using var acw_map = MemoryStreamPool.Shared.CreateStreamWriter ();
-		foreach (TypeDefinition type in javaTypes) {
+		foreach (TypeDefinition type in javaTypes.OrderBy (t => t.FullName.Replace ('/', '.'))) {
 			string managedKey = type.FullName.Replace ('/', '.');
 			string javaKey = JavaNativeTypeManager.ToJniName (type, cache).Replace ('/', '.');
 
@@ -79,7 +81,19 @@ public bool Generate (NativeCodeGenState codeGenState, string acwMapFile)
 		}
 
 		acw_map.Flush ();
-		Files.CopyIfStreamChanged (acw_map.BaseStream, acwMapFile);
+
+		// If there's conflicts, the "new way" file never got written, and will show up as
+		// "changed" in our comparison test, so skip it.
+		if (javaConflicts.Count > 0) {
+			return false;
+		}
+
+		if (Files.HasStreamChanged (acw_map.BaseStream, acwMapFile)) {
+			log.LogError ($"ACW map file '{acwMapFile}' changed");
+			Files.CopyIfStreamChanged (acw_map.BaseStream, acwMapFile + "2");
+		} else {
+			log.LogDebugMessage ($"ACW map file '{acwMapFile}' unchanged");
+		}
 
 		foreach (var kvp in managedConflicts) {
 			log.LogCodedWarning ("XA4214", Properties.Resources.XA4214, kvp.Key, string.Join (", ", kvp.Value));
@@ -99,4 +113,121 @@ public bool Generate (NativeCodeGenState codeGenState, string acwMapFile)
 
 		return success;
 	}
+
+	public void Generate (List<ACWMapEntry> javaTypes, string acwMapFile)
+	{
+		// We need to save a map of .NET type -> ACW type for resource file fixups
+		var managed = new Dictionary<string, ACWMapEntry> (javaTypes.Count, StringComparer.Ordinal);
+		var java = new Dictionary<string, ACWMapEntry> (javaTypes.Count, StringComparer.Ordinal);
+
+		var managedConflicts = new Dictionary<string, List<string>> (0, StringComparer.Ordinal);
+		var javaConflicts = new Dictionary<string, List<string>> (0, StringComparer.Ordinal);
+
+		using var acw_map = MemoryStreamPool.Shared.CreateStreamWriter ();
+
+		foreach (var type in javaTypes.OrderBy (t => t.ManagedKey)) {
+			string managedKey = type.ManagedKey;
+			string javaKey = type.JavaKey;
+
+			acw_map.Write (type.PartialAssemblyQualifiedName);
+			acw_map.Write (';');
+			acw_map.Write (javaKey);
+			acw_map.WriteLine ();
+
+			ACWMapEntry conflict;
+			bool hasConflict = false;
+
+			if (managed.TryGetValue (managedKey, out conflict)) {
+				if (!conflict.ModuleName.Equals (type.ModuleName)) {
+					if (!managedConflicts.TryGetValue (managedKey, out var list))
+						managedConflicts.Add (managedKey, list = new List<string> { conflict.PartialAssemblyName });
+					list.Add (type.PartialAssemblyName);
+				}
+				hasConflict = true;
+			}
+
+			if (java.TryGetValue (javaKey, out conflict)) {
+				if (!conflict.ModuleName.Equals(type.ModuleName)) {
+					if (!javaConflicts.TryGetValue (javaKey, out var list))
+						javaConflicts.Add (javaKey, list = new List<string> { conflict.AssemblyQualifiedName });
+					list.Add (type.AssemblyQualifiedName);
+				}
+				hasConflict = true;
+			}
+
+			if (!hasConflict) {
+				managed.Add (managedKey, type);
+				java.Add (javaKey, type);
+
+				acw_map.Write (managedKey);
+				acw_map.Write (';');
+				acw_map.Write (javaKey);
+				acw_map.WriteLine ();
+
+				acw_map.Write (type.CompatJniName);
+				acw_map.Write (';');
+				acw_map.Write (javaKey);
+				acw_map.WriteLine ();
+			}
+		}
+
+		acw_map.Flush ();
+
+		foreach (var kvp in managedConflicts) {
+			log.LogCodedWarning ("XA4214", Properties.Resources.XA4214, kvp.Key, string.Join (", ", kvp.Value));
+			log.LogCodedWarning ("XA4214", Properties.Resources.XA4214_Result, kvp.Key, kvp.Value [0]);
+		}
+
+		foreach (var kvp in javaConflicts) {
+			log.LogCodedError ("XA4215", Properties.Resources.XA4215, kvp.Key);
+
+			foreach (var typeName in kvp.Value) {
+				log.LogCodedError ("XA4215", Properties.Resources.XA4215_Details, kvp.Key, typeName);
+			}
+		}
+
+		// Don't write the output file if there are any errors so that
+		// future incremental builds will try again.
+		if (javaConflicts.Count > 0)
+			return;
+
+		Files.CopyIfStreamChanged (acw_map.BaseStream, acwMapFile);
+	}
+}
+
+class ACWMapEntry
+{
+	public string AssemblyQualifiedName { get; set; }
+	public string CompatJniName { get; set; }
+	public string JavaKey { get; set; }
+	public string ManagedKey { get; set; }
+	public string ModuleName { get; set; }
+	public string PartialAssemblyName { get; set; }
+	public string PartialAssemblyQualifiedName { get; set; }
+
+	public static ACWMapEntry Create (TypeDefinition type, TypeDefinitionCache cache)
+	{
+		return new ACWMapEntry {
+			AssemblyQualifiedName = type.GetAssemblyQualifiedName (cache),
+			CompatJniName = JavaNativeTypeManager.ToCompatJniName (type, cache).Replace ('/', '.'),
+			JavaKey = JavaNativeTypeManager.ToJniName (type, cache).Replace ('/', '.'),
+			ManagedKey = type.FullName.Replace ('/', '.'),
+			ModuleName = type.Module.Name,
+			PartialAssemblyName = type.GetPartialAssemblyName (cache),
+			PartialAssemblyQualifiedName = type.GetPartialAssemblyQualifiedName (cache),
+		};
+	}
+
+	public static ACWMapEntry Create (XElement type, string partialAssemblyName, string moduleName)
+	{
+		return new ACWMapEntry {
+			AssemblyQualifiedName = type.GetAttributeOrDefault ("assembly-qualified-name", string.Empty),
+			CompatJniName = type.GetAttributeOrDefault ("compat-jni-name", string.Empty),
+			JavaKey = type.GetAttributeOrDefault ("java-key", string.Empty),
+			ManagedKey = type.GetAttributeOrDefault ("managed-key", string.Empty),
+			ModuleName = moduleName,
+			PartialAssemblyName = partialAssemblyName,
+			PartialAssemblyQualifiedName = type.GetAttributeOrDefault ("partial-assembly-qualified-name", string.Empty),
+		};
+	}
 }