[WIP] Duplicate assemblies are treated as arch-specific ones

Author: grendello

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

@@ -78,9 +78,9 @@ public override bool RunTask ()
 			return !Log.HasLoggedErrors;
 		}
 
-		void SetAssemblyAbiMetadata (string abi, string assetType, ITaskItem assembly, ITaskItem? symbol)
+		void SetAssemblyAbiMetadata (string abi, string assetType, ITaskItem assembly, ITaskItem? symbol, bool isDuplicate)
 		{
-			if (String.IsNullOrEmpty (abi) || String.Compare ("native", assetType, StringComparison.OrdinalIgnoreCase) != 0) {
+			if (String.IsNullOrEmpty (abi) || (!isDuplicate && String.Compare ("native", assetType, StringComparison.OrdinalIgnoreCase) != 0)) {
 				return;
 			}
 
@@ -90,7 +90,7 @@ void SetAssemblyAbiMetadata (string abi, string assetType, ITaskItem assembly, I
 			}
 		}
 
-		void SetAssemblyAbiMetadata (ITaskItem assembly, ITaskItem? symbol)
+		void SetAssemblyAbiMetadata (ITaskItem assembly, ITaskItem? symbol, bool isDuplicate)
 		{
 			string assetType = assembly.GetMetadata ("AssetType");
 			string rid = assembly.GetMetadata ("RuntimeIdentifier");
@@ -99,14 +99,14 @@ void SetAssemblyAbiMetadata (ITaskItem assembly, ITaskItem? symbol)
 				return;
 			}
 
-			SetAssemblyAbiMetadata (AndroidRidAbiHelper.RuntimeIdentifierToAbi (rid), assetType, assembly, symbol);
+			SetAssemblyAbiMetadata (AndroidRidAbiHelper.RuntimeIdentifierToAbi (rid), assetType, assembly, symbol, isDuplicate);
 		}
 
 		void SetMetadataForAssemblies (List<ITaskItem> output, Dictionary<string, ITaskItem> symbols)
 		{
 			foreach (var assembly in InputAssemblies) {
 				var symbol = GetOrCreateSymbolItem (symbols, assembly);
-				SetAssemblyAbiMetadata (assembly, symbol);
+				SetAssemblyAbiMetadata (assembly, symbol, isDuplicate: false);
 				symbol?.SetDestinationSubPath ();
 				assembly.SetDestinationSubPath ();
 				assembly.SetMetadata ("FrameworkAssembly", IsFrameworkAssembly (assembly).ToString ());
@@ -144,7 +144,7 @@ void DeduplicateAssemblies (List<ITaskItem> output, Dictionary<string, ITaskItem
 				if (mvids.Count > 1) {
 					foreach (var assembly in group) {
 						var symbol = GetOrCreateSymbolItem (symbols, assembly);
-						SetDestinationSubDirectory (assembly, group.Key, symbol);
+						SetDestinationSubDirectory (assembly, group.Key, symbol, isDuplicate: true);
 						output.Add (assembly);
 					}
 				} else {
@@ -158,6 +158,7 @@ void DeduplicateAssemblies (List<ITaskItem> output, Dictionary<string, ITaskItem
 							symbol?.SetDestinationSubPath ();
 							assembly.SetDestinationSubPath ();
 							output.Add (assembly);
+							SetAssemblyAbiMetadata (assembly, symbol, false);
 						} else {
 							symbols.Remove (Path.ChangeExtension (assembly.ItemSpec, ".pdb"));
 						}
@@ -197,18 +198,16 @@ bool Filter (ITaskItem item)
 		/// <summary>
 		/// Sets %(DestinationSubDirectory) and %(DestinationSubPath) based on %(RuntimeIdentifier)
 		/// </summary>
-		void SetDestinationSubDirectory (ITaskItem assembly, string fileName, ITaskItem? symbol)
+		void SetDestinationSubDirectory (ITaskItem assembly, string fileName, ITaskItem? symbol, bool isDuplicate)
 		{
 			var rid = assembly.GetMetadata ("RuntimeIdentifier");
 			string assetType = assembly.GetMetadata ("AssetType");
 
 			// Satellite assemblies have `RuntimeIdentifier` set, but they shouldn't - they aren't specific to any architecture, so they should have none of the
 			// abi-specific metadata set
 			//
-			// Likewise, only abi-specific assemblies (with `AssetType=native` metadata set) should have the `Destination*` metadata set
 			if (!String.IsNullOrEmpty (assembly.GetMetadata ("Culture")) ||
-			    String.Compare ("resources", assetType, StringComparison.OrdinalIgnoreCase) == 0 ||
-			    String.Compare ("native", assetType, StringComparison.OrdinalIgnoreCase) != 0) {
+			    String.Compare ("resources", assetType, StringComparison.OrdinalIgnoreCase) == 0) {
 				rid = String.Empty;
 			}
 
@@ -223,7 +222,7 @@ void SetDestinationSubDirectory (ITaskItem assembly, string fileName, ITaskItem?
 					symbol.SetMetadata ("DestinationSubPath", Path.Combine (destination, Path.GetFileName (symbol.ItemSpec)));
 				}
 
-				SetAssemblyAbiMetadata (abi, assetType, assembly, symbol);
+				SetAssemblyAbiMetadata (abi, assetType, assembly, symbol, isDuplicate);
 			} else {
 				Log.LogDebugMessage ($"Android ABI not found for: {assembly.ItemSpec}");
 				assembly.SetDestinationSubPath ();

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

@@ -88,7 +88,6 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
 					"Java.Interop.dll",
 					"Mono.Android.dll",
 					"rc.bin",
-					"System.Console.dll",
 					"System.Private.CoreLib.dll",
 					"System.Runtime.dll",
 					"System.Linq.dll",

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

@@ -21,7 +21,6 @@ sealed class Store
 
 		// NOTE: when/if we have parallel BuildApk these should become concurrent collections
 		readonly Dictionary<string, Store> stores = new Dictionary<string, Store> (StringComparer.Ordinal);
-		readonly HashSet<string> seenAssemblies = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
 
 		AssemblyStore indexStore;
 
@@ -45,12 +44,6 @@ public AssemblyStoreGenerator (string archiveAssembliesPrefix, TaskLoggingHelper
 
 		public void Add (string apkName, AssemblyStoreAssemblyInfo storeAssembly)
 		{
-			if (seenAssemblies.Contains (storeAssembly.FilesystemAssemblyPath)) {
-				log.LogMessage (MessageImportance.Low, $"Ignoring duplicate assembly {storeAssembly.FilesystemAssemblyPath} when adding to assembly store set '{apkName}'");
-				return;
-			}
-			seenAssemblies.Add (storeAssembly.FilesystemAssemblyPath);
-
 			if (String.IsNullOrEmpty (apkName)) {
 				throw new ArgumentException ("must not be null or empty", nameof (apkName));
 			}

tools/decompress-assemblies/main.cs

@@ -56,7 +56,7 @@ static bool UncompressDLL (Stream inputStream, string fileName, string filePath,
 							Directory.CreateDirectory (outputDir);
 						}
 						using (var fs = File.Open (outputFile, FileMode.Create, FileAccess.Write)) {
-							fs.Write (assemblyBytes, 0, assemblyBytes.Length);
+							fs.Write (assemblyBytes, 0, decoded);
 							fs.Flush ();
 						}
 						Console.WriteLine ($"  uncompressed to: {outputFile}");