Add suppport for multiple Asset directories

dotnet · Jan 17, 2024 · 207ed62 · 207ed62
1 parent 68a8988
commit 207ed62
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Assets.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Assets.targets
@@ -111,7 +111,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 		DaemonMaxInstanceCount="$(Aapt2DaemonMaxInstanceCount)"
 		DaemonKeepInDomain="$(_Aapt2DaemonKeepInDomain)"
 		OutputArchive="%(_AssetPacks.AssetPackOutput)"
-		AssetDirectory="$(MonoAndroidAssetPacksDirIntermediate)\%(_AssetPacks.AssetPack)\assets"
+		AssetDirectories="$(MonoAndroidAssetPacksDirIntermediate)\%(_AssetPacks.AssetPack)\assets"
 		Manifest="%(_AssetPacks.ManifestFile)"
 		PackageName="$(_AndroidPackage).%(_AssetPacks.AssetPack)"
 		ToolPath="$(Aapt2ToolPath)"

diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2LinkAssetPack.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2LinkAssetPack.cs
@@ -21,7 +21,7 @@ public class Aapt2LinkAssetPack : Aapt2 {
 		public ITaskItem Manifest { get; set; }
 
 		[Required]
-		public ITaskItem AssetDirectory { get; set; }
+		public ITaskItem[] AssetDirectories { get; set; }
 
 		[Required]
 		public string PackageName { get; set; }
@@ -38,7 +38,7 @@ protected override int GetRequiredDaemonInstances ()
 
 		public async override System.Threading.Tasks.Task RunTaskAsync ()
 		{
-			RunAapt (GenerateCommandLineCommands (Manifest, AssetDirectory, OutputArchive), OutputArchive.ItemSpec);
+			RunAapt (GenerateCommandLineCommands (Manifest, OutputArchive), OutputArchive.ItemSpec);
 			ProcessOutput ();
 			if (OutputFormat == "proto" && File.Exists (OutputArchive.ItemSpec)) {
 				// move the manifest to the right place.
@@ -49,7 +49,7 @@ public async override System.Threading.Tasks.Task RunTaskAsync ()
 			}
 		}
 
-		protected string[] GenerateCommandLineCommands (ITaskItem manifest, ITaskItem assetDirectory, ITaskItem output)
+		protected string[] GenerateCommandLineCommands (ITaskItem manifest, ITaskItem output)
 		{
 			//link --manifest AndroidManifest.xml --proto-format --custom-package $(Package) -A $(AssetsDirectory) -o $(_TempOutputFile)
 			List<string> cmd = new List<string> ();
@@ -63,8 +63,10 @@ protected string[] GenerateCommandLineCommands (ITaskItem manifest, ITaskItem as
 			}
 			cmd.Add ("--custom-package");
 			cmd.Add (PackageName);
-			cmd.Add ("-A");
-			cmd.Add (GetFullPath (assetDirectory.ItemSpec));
+			foreach (var assetDirectory in AssetDirectories) {
+				cmd.Add ("-A");
+				cmd.Add (GetFullPath (assetDirectory.ItemSpec));
+			}
 			cmd.Add ($"-o");
 			cmd.Add (GetFullPath (output.ItemSpec));
 			return cmd.ToArray ();