Move more assembly packaging code to the helper class

Author: grendello

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

@@ -459,7 +459,7 @@ void AddAssemblies (ZipArchiveEx apk, bool debug, bool compress, IDictionary<And
 				AddFileToArchiveIfNewer (apk, wrappedSourcePath, inArchivePath, GetCompressionMethod (inArchivePath));
 			}
 
-			void DoAddAssembliesFromArchCollection (AndroidTargetArch arch, Dictionary<string, ITaskItem> assemblies)
+			void DoAddAssembliesFromArchCollection (TaskLoggingHelper log, AndroidTargetArch arch, ITaskItem assembly)
 			{
 				// In the "all assemblies are per-RID" world, assemblies, pdb and config are disguised as shared libraries (that is,
 				// their names end with the .so extension) so that Android allows us to put them in the `lib/{ARCH}` directory.
@@ -501,14 +501,6 @@ void DoAddAssembliesFromArchCollection (AndroidTargetArch arch, Dictionary<strin
 				);
 			}
 
-			void EnsureCompressedAssemblyData (string sourcePath, uint descriptorIndex)
-			{
-				if (compressedAssembly == null)
-					compressedAssembly = new AssemblyCompression.AssemblyData (sourcePath, descriptorIndex);
-				else
-					compressedAssembly.SetData (sourcePath, descriptorIndex);
-			}
-
 			string CompressAssembly (ITaskItem assembly)
 			{
 				if (!compress) {

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

@@ -10,11 +10,7 @@ namespace Xamarin.Android.Tasks;
 
 static class AssemblyPackagingHelper
 {
-<<<<<<< HEAD
 	public static void AddAssembliesFromCollection (TaskLoggingHelper Log, ICollection<string> SupportedAbis, ICollection<ITaskItem> assemblies, Action<TaskLoggingHelper, AndroidTargetArch, ITaskItem> doAddAssembly)
-=======
-	public static void AddAssembliesFromCollection (TaskLoggingHelper Log, ICollection<string> SupportedAbis, ICollection<ITaskItem> assemblies, Action<AndroidTargetArch, Dictionary<string, ITaskItem>> doAddAssemblies)
->>>>>>> c4d883405 (Move some of assembly packaging code to a helper class)
 	{
 		Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> perArchAssemblies = MonoAndroidHelper.GetPerArchAssemblies (
 			assemblies,
@@ -32,7 +28,6 @@ public static void AddAssembliesFromCollection (TaskLoggingHelper Log, ICollecti
 
 		foreach (var kvp in perArchAssemblies) {
 			Log.LogDebugMessage ($"Adding assemblies for architecture '{kvp.Key}'");
-<<<<<<< HEAD
 			DoAddAssembliesFromArchCollection (Log, kvp.Key, kvp.Value, doAddAssembly);
 		}
 	}
@@ -45,9 +40,6 @@ static void DoAddAssembliesFromArchCollection (TaskLoggingHelper Log, AndroidTar
 			}
 
 			doAddAssembly (Log, arch, assembly);
-=======
-			doAddAssemblies (kvp.Key, kvp.Value);
->>>>>>> c4d883405 (Move some of assembly packaging code to a helper class)
 		}
 	}
 }