From 289e72685c43fb720fdd7a0c63bf2297636856a6 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Fri, 20 Jan 2023 12:19:43 +0100
Subject: [PATCH 1/2] Add option to skip generating apk for a specific project

---
 src/mono/msbuild/android/build/AndroidApp.targets            | 5 ++++-
 .../StartupHookForFunctionalTest.csproj                      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/mono/msbuild/android/build/AndroidApp.targets b/src/mono/msbuild/android/build/AndroidApp.targets
index 7c4545dac726a7..763c1c31a1922d 100644
--- a/src/mono/msbuild/android/build/AndroidApp.targets
+++ b/src/mono/msbuild/android/build/AndroidApp.targets
@@ -120,7 +120,10 @@
   </Target>
 
 
-  <Target Name="_AndroidGenerateAppBundle" DependsOnTargets="_AndroidGenerateRuntimeConfig">
+  <Target
+    Name="_AndroidGenerateAppBundle"
+    Condition="$(_SkipAndroidGenerateAppBundle) != 'true'"
+    DependsOnTargets="_AndroidGenerateRuntimeConfig">
 
     <PropertyGroup>
       <RuntimeComponents Condition="'$(RuntimeComponents)' == ''" >marshal-ilgen</RuntimeComponents>
diff --git a/src/tests/FunctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj b/src/tests/FunctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj
index 60a8062556e62e..b76b2ff259213f 100644
--- a/src/tests/FunctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj
+++ b/src/tests/FunctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
         <IsTestProject>false</IsTestProject>
         <IsFunctionalTest>false</IsFunctionalTest>
+        <_SkipAndroidGenerateAppBundle>true</_SkipAndroidGenerateAppBundle>
     </PropertyGroup>
 
     <ItemGroup>

From 969999dca5c27149e15d27bb108e571377a7ff7c Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 23 Jan 2023 17:06:33 +0100
Subject: [PATCH 2/2] Replace _SkipAndroidGenerateAppBundle with
 AndroidGenerateAppBundle

---
 src/mono/msbuild/android/build/AndroidApp.targets           | 6 +++++-
 .../StartupHookForFunctionalTest.csproj                     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mono/msbuild/android/build/AndroidApp.targets b/src/mono/msbuild/android/build/AndroidApp.targets
index 763c1c31a1922d..03f4f04be047f3 100644
--- a/src/mono/msbuild/android/build/AndroidApp.targets
+++ b/src/mono/msbuild/android/build/AndroidApp.targets
@@ -2,6 +2,10 @@
   <UsingTask TaskName="AndroidAppBuilderTask"
              AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
 
+  <PropertyGroup>
+    <AndroidGenerateAppBundle Condition="'$(AndroidGenerateAppBundle)' == ''">true</AndroidGenerateAppBundle>
+  </PropertyGroup>
+
   <Target Name="AndroidBuildApp" AfterTargets="$(AndroidBuildAppAfterThisTarget)" />
 
   <Target Name="_AndroidCoreBuild" BeforeTargets="AndroidBuildApp" DependsOnTargets="$(AndroidBuildAppDependsOn)" />
@@ -122,7 +126,7 @@
 
   <Target
     Name="_AndroidGenerateAppBundle"
-    Condition="$(_SkipAndroidGenerateAppBundle) != 'true'"
+    Condition="$(AndroidGenerateAppBundle) == 'true'"
     DependsOnTargets="_AndroidGenerateRuntimeConfig">
 
     <PropertyGroup>
diff --git a/src/tests/FunctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj b/src/tests/FunctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj
index b76b2ff259213f..4f3961903db695 100644
--- a/src/tests/FunctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj
+++ b/src/tests/FunctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
         <IsTestProject>false</IsTestProject>
         <IsFunctionalTest>false</IsFunctionalTest>
-        <_SkipAndroidGenerateAppBundle>true</_SkipAndroidGenerateAppBundle>
+        <AndroidGenerateAppBundle>false</AndroidGenerateAppBundle>
     </PropertyGroup>
 
     <ItemGroup>