[XABT] Break BuildApk into individual tasks for each content type.

Author: jpobst

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

@@ -60,28 +60,15 @@ public class BuildApk : AndroidTask
 
 		public ITaskItem[] BundleNativeLibraries { get; set; }
 
-		public ITaskItem[] TypeMappings { get; set; }
-
-		[Required]
-		public ITaskItem [] DalvikClasses { get; set; }
-
 		[Required]
 		public string [] SupportedAbis { get; set; }
 
 		public bool EmbedAssemblies { get; set; }
 
 		public bool BundleAssemblies { get; set; }
 
-		public ITaskItem[] JavaSourceFiles { get; set; }
-
-		public ITaskItem[] JavaLibraries { get; set; }
-
 		public string[] DoNotPackageJavaLibraries { get; set; }
 
-		public string [] ExcludeFiles { get; set; }
-
-		public string [] IncludeFiles { get; set; }
-
 		public string Debug { get; set; }
 
 		public string AndroidSequencePointsMode { get; set; }
@@ -101,10 +88,6 @@ public class BuildApk : AndroidTask
 
 		public bool UseAssemblyStore { get; set; }
 
-		public string ZipFlushFilesLimit { get; set; }
-
-		public string ZipFlushSizeLimit { get; set; }
-
 		public int ZipAlignmentPages { get; set; } = AndroidZipAlign.DefaultZipAlignment64Bit;
 
 		[Required]
@@ -134,39 +117,20 @@ bool _Debug {
 
 		SequencePointsMode sequencePointsMode = SequencePointsMode.None;
 
-		public ITaskItem[] LibraryProjectJars { get; set; }
 		HashSet<string> uncompressedFileExtensions;
 
-		// Do not use trailing / in the path
-		public string RootPath { get; set; } = "";
-
-		public string DalvikPath { get; set; } = "";
-
 		protected virtual CompressionMethod UncompressedMethod => CompressionMethod.Store;
 
 		protected virtual void FixupArchive (ZipArchiveFileListBuilder zip) { }
 
 		List<string> existingEntries = new List<string> ();
 
-		List<Regex> excludePatterns = new List<Regex> ();
-
-		List<Regex> includePatterns = new List<Regex> ();
-
 		void ExecuteWithAbi (DSOWrapperGenerator.Config dsoWrapperConfig, string [] supportedAbis, string apkInputPath, string apkOutputPath, bool debug, bool compress, IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>> compressedAssembliesInfo, string assemblyStoreApkName)
 		{
 			ArchiveFileList files = new ArchiveFileList ();
 
 			using (var apk = new ZipArchiveFileListBuilder (apkOutputPath, File.Exists (apkOutputPath) ? FileMode.Open : FileMode.Create)) {
 
-				// Add classes.dx
-				CompressionMethod dexCompressionMethod = GetCompressionMethod (".dex");
-				foreach (var dex in DalvikClasses) {
-					string apkName = dex.GetMetadata ("ApkName");
-					string dexPath = string.IsNullOrWhiteSpace (apkName) ? Path.GetFileName (dex.ItemSpec) : apkName;
-					AddFileToArchiveIfNewer (apk, dex.ItemSpec, DalvikPath + dexPath, compressionMethod: dexCompressionMethod);
-					apk.Flush ();
-				}
-
 				if (EmbedAssemblies) {
 					AddAssemblies (dsoWrapperConfig, apk, debug, compress, compressedAssembliesInfo, assemblyStoreApkName);
 					apk.Flush ();
@@ -178,12 +142,6 @@ void ExecuteWithAbi (DSOWrapperGenerator.Config dsoWrapperConfig, string [] supp
 				AddNativeLibraries (files, supportedAbis);
 				AddAdditionalNativeLibraries (files, supportedAbis);
 
-				if (TypeMappings != null) {
-					foreach (ITaskItem typemap in TypeMappings) {
-						AddFileToArchiveIfNewer (apk, typemap.ItemSpec, RootPath + Path.GetFileName(typemap.ItemSpec), compressionMethod: UncompressedMethod);
-					}
-				}
-
 				foreach (var file in files) {
 					var item = Path.Combine (file.archivePath.Replace (Path.DirectorySeparatorChar, '/'));
 					existingEntries.Remove (item);
@@ -196,63 +154,6 @@ void ExecuteWithAbi (DSOWrapperGenerator.Config dsoWrapperConfig, string [] supp
 					apk.AddFileAndFlush (file.filePath, item, compressionMethod: compressionMethod);
 				}
 
-				var jarFiles = (JavaSourceFiles != null) ? JavaSourceFiles.Where (f => f.ItemSpec.EndsWith (".jar", StringComparison.OrdinalIgnoreCase)) : null;
-				if (jarFiles != null && JavaLibraries != null)
-					jarFiles = jarFiles.Concat (JavaLibraries);
-				else if (JavaLibraries != null)
-					jarFiles = JavaLibraries;
-
-				var libraryProjectJars  = MonoAndroidHelper.ExpandFiles (LibraryProjectJars)
-					.Where (jar => !MonoAndroidHelper.IsEmbeddedReferenceJar (jar));
-
-				var jarFilePaths = libraryProjectJars.Concat (jarFiles != null ? jarFiles.Select (j => j.ItemSpec) : Enumerable.Empty<string> ());
-				jarFilePaths = MonoAndroidHelper.DistinctFilesByContent (jarFilePaths);
-
-				foreach (var jarFile in jarFilePaths) {
-					using (var stream = File.OpenRead (jarFile))
-					using (var jar = ZipArchive.Open (stream)) {
-						foreach (var jarItem in jar) {
-							if (jarItem.IsDirectory)
-								continue;
-							var name = jarItem.FullName;
-							if (!PackagingUtils.CheckEntryForPackaging (name)) {
-								continue;
-							}
-							var path = RootPath + name;
-							existingEntries.Remove (path);
-							if (apk.SkipExistingEntry (jarItem, path)) {
-								Log.LogDebugMessage ($"Skipping {path} as the archive file is up to date.");
-								continue;
-							}
-							// check for ignored items
-							bool exclude = false;
-							bool forceInclude = false;
-							foreach (var include in includePatterns) {
-								if (include.IsMatch (path)) {
-									forceInclude = true;
-									break;
-								}
-							}
-							if (!forceInclude) {
-								foreach (var pattern in excludePatterns) {
-									if (pattern.IsMatch (path)) {
-										Log.LogDebugMessage ($"Ignoring jar entry '{name}' from '{Path.GetFileName (jarFile)}'. Filename matched the exclude pattern '{pattern}'.");
-										exclude = true;
-										break;
-									}
-								}
-							}
-							if (exclude)
-								continue;
-							if (string.Compare (Path.GetFileName (name), "AndroidManifest.xml", StringComparison.OrdinalIgnoreCase) == 0) {
-								Log.LogDebugMessage ("Ignoring jar entry {0} from {1}: the same file already exists in the apk", name, Path.GetFileName (jarFile));
-								continue;
-							}
-
-							apk.AddJavaEntryAndFlush (jarFile, jarItem.FullName, path);
-						}
-					}
-				}
 				FixupArchive (apk);
 
 				OutputApkFiles = apk.ApkFiles.ToArray ();
@@ -280,13 +181,6 @@ public override bool RunTask ()
 
 			existingEntries.Clear ();
 
-			foreach (var pattern in ExcludeFiles ?? Array.Empty<string> ()) {
-				excludePatterns.Add (FileGlobToRegEx (pattern, RegexOptions.IgnoreCase | RegexOptions.Compiled));
-			}
-			foreach (var pattern in IncludeFiles ?? Array.Empty<string> ()) {
-				includePatterns.Add (FileGlobToRegEx (pattern, RegexOptions.IgnoreCase | RegexOptions.Compiled));
-			}
-
 			bool debug = _Debug;
 			bool compress = !debug && EnableCompression;
 			IDictionary<AndroidTargetArch, Dictionary<string, CompressedAssemblyInfo>> compressedAssembliesInfo = null;
@@ -311,24 +205,6 @@ public override bool RunTask ()
 			return !Log.HasLoggedErrors;
 		}
 
-		static Regex FileGlobToRegEx (string fileGlob, RegexOptions options)
-		{
-			StringBuilder sb = new StringBuilder ();
-			foreach (char c in fileGlob) {
-				switch (c) {
-					case '*': sb.Append (".*");
-						break;
-					case '?': sb.Append (".");
-						break;
-					case '.': sb.Append (@"\.");
-						break;
-					default: sb.Append (c);
-						break;
-				}
-			}
-			return new Regex (sb.ToString (), options);
-		}
-
 		void AddRuntimeConfigBlob (DSOWrapperGenerator.Config dsoWrapperConfig, ZipArchiveFileListBuilder apk)
 		{
 			// We will place rc.bin in the `lib` directory next to the blob, to make startup slightly faster, as we will find the config file right after we encounter

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

@@ -12,7 +12,9 @@ namespace Xamarin.Android.Tasks;
 
 /// <summary>
 /// Takes a list of files and adds them to an APK archive. If the APK archive already
-/// exists, files are only added if they were changed.
+/// exists, files are only added if they were changed. Note *ALL* files to be in the final
+/// APK must be passed in via @(FilesToAddToArchive). This task will determine any unchanged files
+/// and skip them, as well as remove any existing files in the APK that are no longer required.
 /// </summary>
 public class BuildArchive : AndroidTask
 {

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

@@ -0,0 +1,46 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Xamarin.Android.Tasks;
+
+/// <summary>
+/// Collects Dalvik classes to be added to the final archive.
+/// </summary>
+public class CollectDalvikFilesForArchive : AndroidTask
+{
+	public override string TaskPrefix => "CDF";
+
+	public string AndroidPackageFormat { get; set; } = "";
+
+	[Required]
+	public ITaskItem [] DalvikClasses { get; set; } = [];
+
+	[Output]
+	public ITaskItem [] FilesToAddToArchive { get; set; } = [];
+
+	public override bool RunTask ()
+	{
+		var dalvikPath = AndroidPackageFormat.Equals ("aab", StringComparison.InvariantCultureIgnoreCase) ? "dex/" : "";
+		var files = new List<ITaskItem> ();
+
+		foreach (var dex in DalvikClasses) {
+			var apkName = dex.GetMetadata ("ApkName");
+			var dexPath = string.IsNullOrWhiteSpace (apkName) ? Path.GetFileName (dex.ItemSpec) : apkName;
+
+			var item = new TaskItem (dex.ItemSpec);
+			item.SetMetadata ("ArchivePath", dalvikPath + dexPath);
+
+			files.Add (item);
+		}
+
+		FilesToAddToArchive = files.ToArray ();
+
+		return !Log.HasLoggedErrors;
+	}
+}