From d76375b9797782ede33634da6170a87ea39b7920 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Mon, 29 Jan 2024 14:41:31 +0000
Subject: [PATCH] Add properties

---
 .../Android/Xamarin.Android.Assets.targets    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 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
index 2002a9563f8..c5605c9cc56 100644
--- 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
@@ -28,6 +28,16 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 		<MonoAndroidAssetsDirIntermediate>$(IntermediateOutputPath)assets\</MonoAndroidAssetsDirIntermediate>
 		<MonoAndroidAssetPacksDirIntermediate>$(IntermediateOutputPath)assetpacks</MonoAndroidAssetPacksDirIntermediate>
 		<MonoAndroidAssetsPrefix Condition="'$(MonoAndroidAssetsPrefix)' == ''">Assets</MonoAndroidAssetsPrefix>
+		<AndroidIncludeAssetPacksInPackage Condition=" '$(AndroidIncludeAssetPacksInPackage)' == '' ">true</AndroidIncludeAssetPacksInPackage>
+</PropertyGroup>
+
+<PropertyGroup>
+	<BeforeBuildAndroidAssetPacks>
+		UpdateAndroidAssets
+		;_CalculateAssetPacks
+		;$(BeforeBuildAndroidAssetPacks)
+		;_CreateAssetPackManifests
+	</BeforeBuildAndroidAssetPacks>
 </PropertyGroup>
 
 <!-- Assets Build -->
@@ -65,7 +75,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 </Target>
 
 <Target Name="_CalculateAssetPacks"
-		Condition=" '$(AndroidPackageFormat)' == 'aab' And '$(AndroidApplication)' == 'true' "
+		Condition=" ('$(AndroidPackageFormat)' == 'aab' And '$(AndroidApplication)' == 'true') "
 	>
 	<!-- Enumerate the assetpacks directory and build a pack per top level directory -->
 	<GetAssetPacks Assets="@(AndroidAsset)" IntermediateDir="$(MonoAndroidAssetPacksDirIntermediate)">
@@ -83,8 +93,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 </Target>
 
 <Target Name="_CreateAssetPackManifests"
-		Condition=" '$(AndroidPackageFormat)' == 'aab' And '$(AndroidApplication)' == 'true' "
-		DependsOnTargets="UpdateAndroidAssets;_CalculateAssetPacks"
+		Condition=" ('$(AndroidPackageFormat)' == 'aab' And '$(AndroidApplication)' == 'true') "
 		Inputs="@(_AssetPacks->'%(AssetPackCacheFile)')"
 		Outputs="@(_AssetPacks->'%(ManifestFile)')">
 
@@ -101,9 +110,8 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 </Target>
 
 <Target Name="_BuildAssetPacks"
-		AfterTargets="_CreateBaseApk"
-		DependsOnTargets="_CreateAssetPackManifests"
-		Condition=" '$(AndroidPackageFormat)' == 'aab' And '$(AndroidApplication)' == 'true' "
+		DependsOnTargets="$(BeforeBuildAndroidAssetPacks)"
+		Condition=" ('$(AndroidPackageFormat)' == 'aab' And '$(AndroidApplication)' == 'true') "
 		Inputs="@(_AssetPacks->'%(AssetPackCacheFile)')"
 		Outputs="@(_AssetPacks->'%(AssetPackOutput)')">
 
@@ -111,14 +119,14 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 		DaemonMaxInstanceCount="$(Aapt2DaemonMaxInstanceCount)"
 		DaemonKeepInDomain="$(_Aapt2DaemonKeepInDomain)"
 		OutputArchive="%(_AssetPacks.AssetPackOutput)"
-		AssetDirectories="$(MonoAndroidAssetPacksDirIntermediate)\%(_AssetPacks.AssetPack)\assets"
+		AssetDirectories="%(_AssetPacks.AssetPackDirectory)"
 		Manifest="%(_AssetPacks.ManifestFile)"
 		PackageName="$(_AndroidPackage).%(_AssetPacks.AssetPack)"
 		ToolPath="$(Aapt2ToolPath)"
 		ToolExe="$(Aapt2ToolExe)"
 	/>
 	<ItemGroup>
-		<AndroidAppBundleModules Include="%(_AssetPacks.AssetPackOutput)" />
+		<AndroidAppBundleModules Include="%(_AssetPacks.AssetPackOutput)" Condition=" '$(AndroidIncludeAssetPacksInPackage)' == 'true' "/>
 		<FileWrites Include="$%(_AssetPacks.AssetPackOutput)" />
 	</ItemGroup>
 </Target>