Make all assemblies RID-specific

Directory.Build.props

@@ -48,7 +48,7 @@
     <NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>
     <LZ4PackageVersion>1.1.11</LZ4PackageVersion>
     <MonoOptionsVersion>6.12.0.148</MonoOptionsVersion>
-    <SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
+    <SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <ELFSharpVersion>2.13.1</ELFSharpVersion>
     <HumanizerVersion>2.14.1</HumanizerVersion>

Xamarin.Android.sln

@@ -109,7 +109,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "decompress-assemblies", "to
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tmt", "tools\tmt\tmt.csproj", "{1A273ED2-AE84-48E9-9C23-E978C2D0CB34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "assembly-store-reader", "tools\assembly-store-reader\assembly-store-reader.csproj", "{DA50FC92-7FE7-48B5-BDB6-CDA57B37BB51}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "assembly-store-reader", "tools\assembly-store-reader-mk2\assembly-store-reader.csproj", "{DA50FC92-7FE7-48B5-BDB6-CDA57B37BB51}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaTypeSystem", "external\Java.Interop\src\Java.Interop.Tools.JavaTypeSystem\Java.Interop.Tools.JavaTypeSystem.csproj", "{4EFCED6E-9A6B-453A-94E4-CE4B736EC684}"
 EndProject

build-tools/scripts/TestApks.targets

@@ -111,7 +111,14 @@
         Timeout="60000"
     />
     <Xamarin.Android.Tools.BootstrapTasks.Adb
-        Arguments="$(_AdbTarget) logcat -G 4M"
+        Arguments="$(_AdbTarget) logcat -G 256M"
+        IgnoreExitCode="True"
+        ToolExe="$(AdbToolExe)"
+        ToolPath="$(AdbToolPath)"
+        Timeout="60000"
+    />
+    <Xamarin.Android.Tools.BootstrapTasks.Adb
+        Arguments="$(_AdbTarget) logcat -c"
         IgnoreExitCode="True"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"

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

@@ -120,11 +120,14 @@ _ResolveAssemblies MSBuild target.
       <_ResolvedSymbolFiles   Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.pdb' " />
       <_ResolvedJavaLibraries Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.jar' " />
     </ItemGroup>
+
+    <!-- All assemblies must be per-RID, thus no `->Distinct()` on `InputAssemblies` or `ResolvedSymbols` items -->
     <ProcessAssemblies
         RuntimeIdentifiers="@(_RIDs)"
-        InputAssemblies="@(_ResolvedAssemblyFiles->Distinct())"
+        DesignTimeBuild="$(DesignTimeBuild)"
+        InputAssemblies="@(_ResolvedAssemblyFiles)"
         InputJavaLibraries="@(_ResolvedJavaLibraries->Distinct())"
-        ResolvedSymbols="@(_ResolvedSymbolFiles->Distinct())"
+        ResolvedSymbols="@(_ResolvedSymbolFiles)"
         AndroidIncludeDebugSymbols="$(AndroidIncludeDebugSymbols)"
         PublishTrimmed="$(PublishTrimmed)">
       <Output TaskParameter="OutputAssemblies" ItemName="_ProcessedAssemblies" />

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

@@ -4,6 +4,8 @@
 using Microsoft.Build.Framework;
 using Microsoft.Android.Build.Tasks;
 
+using Xamarin.Android.Tools;
+
 namespace Xamarin.Android.Tasks
 {
 	public class GenerateCompressedAssembliesNativeSourceFiles : AndroidTask
@@ -41,38 +43,54 @@ void GenerateCompressedAssemblySources ()
 				return;
 			}
 
-			var assemblies = new SortedDictionary<string, CompressedAssemblyInfo> (StringComparer.Ordinal);
-			foreach (ITaskItem assembly in ResolvedAssemblies) {
-				if (bool.TryParse (assembly.GetMetadata ("AndroidSkipAddToPackage"), out bool value) && value) {
-					continue;
-				}
+			Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> perArchAssemblies = MonoAndroidHelper.GetPerArchAssemblies (
+				ResolvedAssemblies,
+				SupportedAbis,
+				validate: true,
+				shouldSkip: (ITaskItem asm) => bool.TryParse (asm.GetMetadata ("AndroidSkipAddToPackage"), out bool value) && value
+			);
+			var archAssemblies = new Dictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>> ();
+			var counters = new Dictionary<AndroidTargetArch, uint> ();
+
+			foreach (var kvpPerArch in perArchAssemblies) {
+				AndroidTargetArch arch = kvpPerArch.Key;
+				Dictionary<string, ITaskItem> resolvedArchAssemblies = kvpPerArch.Value;
+
+				foreach (var kvp in resolvedArchAssemblies) {
+					ITaskItem assembly = kvp.Value;
+
+					if (!archAssemblies.TryGetValue (arch, out Dictionary<string, CompressedAssemblyInfo> assemblies)) {
+						assemblies = new Dictionary<string, CompressedAssemblyInfo> (StringComparer.OrdinalIgnoreCase);
+						archAssemblies.Add (arch, assemblies);
+					}
 
-				var assemblyKey = CompressedAssemblyInfo.GetDictionaryKey (assembly);
-				if (assemblies.ContainsKey (assemblyKey)) {
-					Log.LogDebugMessage ($"Skipping duplicate assembly: {assembly.ItemSpec}");
-					continue;
-				}
+					var assemblyKey = CompressedAssemblyInfo.GetDictionaryKey (assembly);
+					if (assemblies.ContainsKey (assemblyKey)) {
+						Log.LogDebugMessage ($"Skipping duplicate assembly: {assembly.ItemSpec} (arch {MonoAndroidHelper.GetAssemblyAbi(assembly)})");
+						continue;
+					}
 
-				var fi = new FileInfo (assembly.ItemSpec);
-				if (!fi.Exists) {
-					Log.LogError ($"Assembly {assembly.ItemSpec} does not exist");
-					continue;
-				}
+					var fi = new FileInfo (assembly.ItemSpec);
+					if (!fi.Exists) {
+						Log.LogError ($"Assembly {assembly.ItemSpec} does not exist");
+						continue;
+					}
 
-				assemblies.Add (assemblyKey, new CompressedAssemblyInfo (checked((uint)fi.Length)));
-			}
 
-			uint index = 0;
-			foreach (var kvp in assemblies) {
-				kvp.Value.DescriptorIndex = index++;
+					if (!counters.TryGetValue (arch, out uint counter)) {
+						counter = 0;
+					}
+					assemblies.Add (assemblyKey, new CompressedAssemblyInfo (checked((uint)fi.Length), counter++, arch, Path.GetFileNameWithoutExtension (assembly.ItemSpec)));
+					counters[arch] = counter;
+				}
 			}
 
 			string key = CompressedAssemblyInfo.GetKey (ProjectFullPath);
 			Log.LogDebugMessage ($"Storing compression assemblies info with key '{key}'");
-			BuildEngine4.RegisterTaskObjectAssemblyLocal (key, assemblies, RegisteredTaskObjectLifetime.Build);
-			Generate (assemblies);
+			BuildEngine4.RegisterTaskObjectAssemblyLocal (key, archAssemblies, RegisteredTaskObjectLifetime.Build);
+			Generate (archAssemblies);
 
-			void Generate (IDictionary<string, CompressedAssemblyInfo> dict)
+			void Generate (Dictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>> dict)
 			{
 				var composer = new CompressedAssembliesNativeAssemblyGenerator (Log, dict);
 				LLVMIR.LlvmIrModule compressedAssemblies = composer.Construct ();