Embed some data files in libxamarin-app.so

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.After.targets

@@ -29,4 +29,5 @@ This file is imported *after* the Microsoft.NET.Sdk/Sdk.targets.
   <Import Project="Microsoft.Android.Sdk.Publish.targets" />
   <Import Project="Microsoft.Android.Sdk.RuntimeConfig.targets" />
   <Import Project="Microsoft.Android.Sdk.Tooling.targets" />
+  <Import Project="Microsoft.Android.Sdk.AssemblyStores.targets" />
 </Project>

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyStores.targets

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="Xamarin.Android.Tasks.CreateEmbeddedAssemblyStore" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
+  <UsingTask TaskName="Xamarin.Android.Tasks.PrepareAbiItems" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
+
+  <Target Name="_PrepareCreateEmbeddedAssemblyStoreOutputItems">
+    <PrepareAbiItems
+      BuildTargetAbis="@(_BuildTargetAbis)"
+      NativeSourcesDir="$(_NativeAssemblySourceDir)"
+      Mode="EmbeddedAssemblyStore">
+      <Output TaskParameter="AssemblySources" ItemName="_EmbeddedAssemblyStoreSourceFiles" />
+    </PrepareAbiItems>
+
+    <ItemGroup>
+      <_CreateEmbeddedAssemblyStoreAssembly Include="@(_ShrunkUserAssemblies);@(_AndroidResolvedSatellitePaths);@(_ShrunkFrameworkAssemblies)"/>
+      <_CreateEmbeddedAssemblyStoreAssembly Condition=" '@(_CreateEmbeddedAssemblyStoreAssembly->Count())' == '0' " Include="@(_ResolvedUserAssemblies);@(_ResolvedFrameworkAssemblies);@(_AndroidResolvedSatellitePaths)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_CreateEmbeddedAssemblyStore"
+          DependsOnTargets="_PrepareCreateEmbeddedAssemblyStoreOutputItems"
+          Inputs="@(_CreateEmbeddedAssemblyStoreAssembly)"
+          Outputs="@(_EmbeddedAssemblyStoreSourceFiles)">
+    <CreateEmbeddedAssemblyStore
+        AndroidBinUtilsDirectory="$(AndroidBinUtilsDirectory)"
+        AppSharedLibrariesDir="$(_AndroidApplicationSharedLibraryPath)"
+        AssemblySourcesDir="$(IntermediateOutputPath)android"
+        AssemblyStoreEmbeddedInRuntime="$(_EmbedAssemblyStoreInRuntime)"
+        IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
+        ResolvedUserAssemblies="@(_ShrunkUserAssemblies);@(_AndroidResolvedSatellitePaths)"
+        ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
+        SupportedAbis="@(_BuildTargetAbis)" />
+
+    <ItemGroup>
+      <FileWrites Include="@(_EmbeddedAssemblyStoreSourceFiles)" />
+    </ItemGroup>
+  </Target>
+</Project>

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets

@@ -62,7 +62,6 @@ properties that determine build ordering.
     <_PrepareBuildApkDependsOnTargets>
       _SetLatestTargetFrameworkVersion;
       _GetLibraryImports;
-      _RemoveRegisterAttribute;
       _ResolveAssemblies;
       _ResolveSatellitePaths;
       _CreatePackageWorkspace;

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

@@ -2,12 +2,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Threading;
 
 using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-using Xamarin.Android.Tools;
 using Microsoft.Android.Build.Tasks;
 
 namespace Xamarin.Android.Tasks
@@ -37,109 +33,34 @@ sealed class Config
 
 		public override System.Threading.Tasks.Task RunTaskAsync ()
 		{
-			return this.WhenAll (GetAssemblerConfigs (), RunAssembler);
+			var context = new NativeAssemblerCompilation.AssemblerRunContext (
+				Log,
+				Path.GetFullPath (WorkingDirectory),
+				registerForCancellation: RegisterForCancellation,
+				cancel: Cancel
+			);
+
+			return this.WhenAll (
+				GetAssemblerConfigs (),
+				(NativeAssemblerCompilation.AssemblerConfig config) => NativeAssemblerCompilation.RunAssembler (context, config)
+			);
 		}
 
-		void RunAssembler (Config config)
+		void RegisterForCancellation (Process proc)
 		{
-			var stdout_completed = new ManualResetEvent (false);
-			var stderr_completed = new ManualResetEvent (false);
-			var psi = new ProcessStartInfo () {
-				FileName = config.AssemblerPath,
-				Arguments = config.AssemblerOptions,
-				UseShellExecute = false,
-				RedirectStandardOutput = true,
-				RedirectStandardError = true,
-				CreateNoWindow = true,
-				WindowStyle = ProcessWindowStyle.Hidden,
-				WorkingDirectory = WorkingDirectory,
-			};
-
-			string assemblerName = Path.GetFileName (config.AssemblerPath);
-			LogDebugMessage ($"[LLVM llc] {psi.FileName} {psi.Arguments}");
-
-			var stdoutLines = new List<string> ();
-			var stderrLines = new List<string> ();
-
-			using (var proc = new Process ()) {
-				proc.OutputDataReceived += (s, e) => {
-					if (e.Data != null) {
-						OnOutputData (assemblerName, s, e);
-						stdoutLines.Add (e.Data);
-					} else
-						stdout_completed.Set ();
-				};
-
-				proc.ErrorDataReceived += (s, e) => {
-					if (e.Data != null) {
-						OnErrorData (assemblerName, s, e);
-						stderrLines.Add (e.Data);
-					} else
-						stderr_completed.Set ();
-				};
-
-				proc.StartInfo = psi;
-				proc.Start ();
-				proc.BeginOutputReadLine ();
-				proc.BeginErrorReadLine ();
-				CancellationToken.Register (() => { try { proc.Kill (); } catch (Exception) { } });
-				proc.WaitForExit ();
-
-				if (psi.RedirectStandardError)
-					stderr_completed.WaitOne (TimeSpan.FromSeconds (30));
-
-				if (psi.RedirectStandardOutput)
-					stdout_completed.WaitOne (TimeSpan.FromSeconds (30));
-
-				if (proc.ExitCode != 0) {
-					var sb = MonoAndroidHelper.MergeStdoutAndStderrMessages (stdoutLines, stderrLines);
-					LogCodedError ("XA3006", Properties.Resources.XA3006, Path.GetFileName (config.InputSource), sb.ToString ());
-					Cancel ();
+			CancellationToken.Register (() => {
+				try {
+					proc.Kill ();
+				} catch (Exception) {
 				}
-			}
+			});
 		}
 
-		IEnumerable<Config> GetAssemblerConfigs ()
+		IEnumerable<NativeAssemblerCompilation.AssemblerConfig> GetAssemblerConfigs ()
 		{
-			const string assemblerOptions =
-				"-O2 " +
-				"--debugger-tune=lldb " + // NDK uses lldb now
-				"--debugify-level=location+variables " +
-				"--fatal-warnings " +
-				"--filetype=obj " +
-				"--relocation-model=pic";
-			string llcPath = Path.Combine (AndroidBinUtilsDirectory, "llc");
-
 			foreach (ITaskItem item in Sources) {
-				// We don't need the directory since our WorkingDirectory is where all the sources are
-				string sourceFile = Path.GetFileName (item.ItemSpec);
-				string outputFile = QuoteFileName (sourceFile.Replace (".ll", ".o"));
-				string executableDir = Path.GetDirectoryName (llcPath);
-				string executableName = MonoAndroidHelper.GetExecutablePath (executableDir, Path.GetFileName (llcPath));
-
-				yield return new Config {
-					InputSource = item.ItemSpec,
-					AssemblerPath = Path.Combine (executableDir, executableName),
-					AssemblerOptions = $"{assemblerOptions} -o={outputFile} {QuoteFileName (sourceFile)}",
-				};
+				yield return NativeAssemblerCompilation.GetAssemblerConfig (AndroidBinUtilsDirectory, item, stripFilePaths: true);
 			}
 		}
-
-		void OnOutputData (string assemblerName, object sender, DataReceivedEventArgs e)
-		{
-			LogDebugMessage ($"[{assemblerName} stdout] {e.Data}");
-		}
-
-		void OnErrorData (string assemblerName, object sender, DataReceivedEventArgs e)
-		{
-			LogMessage ($"[{assemblerName} stderr] {e.Data}", MessageImportance.High);
-		}
-
-		static string QuoteFileName (string fileName)
-		{
-			var builder = new CommandLineBuilder ();
-			builder.AppendFileNameIfNotNull (fileName);
-			return builder.ToString ();
-		}
 	}
 }

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

@@ -36,49 +36,16 @@ public class CreateAssemblyStore : AndroidTask
 	public override bool RunTask ()
 	{
 		// Get all the user and framework assemblies we may need to package
-		var assemblies = ResolvedFrameworkAssemblies.Concat (ResolvedUserAssemblies).Where (asm => !(ShouldSkipAssembly (asm))).ToArray ();
+		var assemblies = ResolvedFrameworkAssemblies.Concat (ResolvedUserAssemblies).Where (asm => !(AssemblyPackagingHelper.ShouldSkipAssembly (Log, asm)));
 
 		if (!UseAssemblyStore) {
-			AssembliesToAddToArchive = assemblies;
+			AssembliesToAddToArchive = assemblies.ToArray ();
 			return !Log.HasLoggedErrors;
 		}
 
-		var store_builder = new AssemblyStoreBuilder (Log);
-		var per_arch_assemblies = MonoAndroidHelper.GetPerArchAssemblies (assemblies, SupportedAbis, true);
-
-		foreach (var kvp in per_arch_assemblies) {
-			Log.LogDebugMessage ($"Adding assemblies for architecture '{kvp.Key}'");
-
-			foreach (var assembly in kvp.Value.Values) {
-				var sourcePath = assembly.GetMetadataOrDefault ("CompressedAssembly", assembly.ItemSpec);
-				store_builder.AddAssembly (sourcePath, assembly, includeDebugSymbols: IncludeDebugSymbols);
-
-				Log.LogDebugMessage ($"Added '{sourcePath}' to assembly store.");
-			}
-		}
-
-		var assembly_store_paths = store_builder.Generate (AppSharedLibrariesDir);
-
-		if (assembly_store_paths.Count == 0) {
-			throw new InvalidOperationException ("Assembly store generator did not generate any stores");
-		}
-
-		if (assembly_store_paths.Count != SupportedAbis.Length) {
-			throw new InvalidOperationException ("Internal error: assembly store did not generate store for each supported ABI");
-		}
-
+		var assembly_store_paths = AssemblyPackagingHelper.CreateAssemblyStore (Log, assemblies, AppSharedLibrariesDir, SupportedAbis, IncludeDebugSymbols);
 		AssembliesToAddToArchive = assembly_store_paths.Select (kvp => new TaskItem (kvp.Value, new Dictionary<string, string> { { "Abi", MonoAndroidHelper.ArchToAbi (kvp.Key) } })).ToArray ();
 
 		return !Log.HasLoggedErrors;
 	}
-
-	bool ShouldSkipAssembly (ITaskItem asm)
-	{
-		var should_skip = asm.GetMetadataOrDefault ("AndroidSkipAddToPackage", false);
-
-		if (should_skip)
-			Log.LogDebugMessage ($"Skipping {asm.ItemSpec} due to 'AndroidSkipAddToPackage' == 'true' ");
-
-		return should_skip;
-	}
 }

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

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Xamarin.Android.Tools;
+
+namespace Xamarin.Android.Tasks;
+
+public class CreateEmbeddedAssemblyStore : AndroidTask
+{
+	public override string TaskPrefix => "CEAS";
+
+	[Required]
+	public string AndroidBinUtilsDirectory { get; set; } = "";
+
+	[Required]
+	public string AppSharedLibrariesDir { get; set; } = "";
+
+	[Required]
+	public string AssemblySourcesDir { get; set; } = "";
+
+	[Required]
+	public bool AssemblyStoreEmbeddedInRuntime { get; set; }
+
+	[Required]
+	public bool IncludeDebugSymbols { get; set; }
+
+	[Required]
+	public ITaskItem[] ResolvedUserAssemblies { get; set; } = [];
+
+	[Required]
+	public ITaskItem[] ResolvedFrameworkAssemblies { get; set; } = [];
+
+	[Required]
+	public string [] SupportedAbis { get; set; } = [];
+
+	public override bool RunTask ()
+	{
+		if (AssemblyStoreEmbeddedInRuntime) {
+			return EmbedAssemblyStore ();
+		}
+
+		// Generate sources to satisfy libmonodroid's ABI requirements
+		foreach (string abi in SupportedAbis) {
+			ELFEmbeddingHelper.EmbedBinary (
+				Log,
+				abi,
+				AndroidBinUtilsDirectory,
+				inputFile: null,
+				ELFEmbeddingHelper.KnownEmbedItems.AssemblyStore,
+				AssemblySourcesDir,
+				missingContentOK: true
+			);
+		}
+
+		return !Log.HasLoggedErrors;
+	}
+
+	bool EmbedAssemblyStore ()
+	{
+		var assemblies = ResolvedFrameworkAssemblies.Concat (ResolvedUserAssemblies).Where (asm => !(AssemblyPackagingHelper.ShouldSkipAssembly (Log, asm)));
+		var assemblyStorePaths = AssemblyPackagingHelper.CreateAssemblyStore (
+			Log, assemblies,
+			Path.Combine (AppSharedLibrariesDir, "embedded"),
+			SupportedAbis,
+			IncludeDebugSymbols
+		);
+
+		foreach (var kvp in assemblyStorePaths) {
+			string abi = MonoAndroidHelper.ArchToAbi (kvp.Key);
+			string inputFile = kvp.Value;
+
+			ELFEmbeddingHelper.EmbedBinary (
+				Log,
+				abi,
+				AndroidBinUtilsDirectory,
+				inputFile,
+				ELFEmbeddingHelper.KnownEmbedItems.AssemblyStore,
+				AssemblySourcesDir,
+				missingContentOK: false
+			);
+		}
+
+		return !Log.HasLoggedErrors;
+	}
+}