From 779ea75f9dfc646f216df692d35c6d4b33bca83e Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 5 Apr 2023 10:25:47 -0400
Subject: [PATCH 1/3] [Android] Free up more disk space on CI builds

The android builds are running out of disk space when building the library test apps.  This change tries to recoup some of that space by deleting artifacts after each test was built.
---
 eng/testing/tests.android.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/testing/tests.android.targets b/eng/testing/tests.android.targets
index 9f67b7b3c6a24..f29c29c30edd9 100644
--- a/eng/testing/tests.android.targets
+++ b/eng/testing/tests.android.targets
@@ -69,6 +69,8 @@
           DestinationFolder="$(TestArchiveTestsDir)"
           SkipUnchangedFiles="true"
           Condition="'$(ArchiveTests)' == 'true' and '$(IgnoreForCI)' != 'true'" />
+
+    <RemoveDir Condition="'$(ArchiveTests)' == 'true'" Directories="$(OutDir)" />
   </Target>
 
 </Project>
\ No newline at end of file

From 2a801bc7ac1b298f3c28f4f0dc9f8b7ee5a8f8a4 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 5 Apr 2023 11:27:11 -0400
Subject: [PATCH 2/3] Fix startuphook test.

---
 .../Android.Device_Emulator.StartupHook.Test.csproj           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tests/FunctionalTests/Android/Device_Emulator/StartupHook/Android.Device_Emulator.StartupHook.Test.csproj b/src/tests/FunctionalTests/Android/Device_Emulator/StartupHook/Android.Device_Emulator.StartupHook.Test.csproj
index 16635288c9c9b..79a8b8cd63cfc 100644
--- a/src/tests/FunctionalTests/Android/Device_Emulator/StartupHook/Android.Device_Emulator.StartupHook.Test.csproj
+++ b/src/tests/FunctionalTests/Android/Device_Emulator/StartupHook/Android.Device_Emulator.StartupHook.Test.csproj
@@ -14,6 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-      <ProjectReference Include="..\..\..\TestAssets\StartupHookForFunctionalTest\StartupHookForFunctionalTest.csproj" />
+      <ProjectReference Include="..\..\..\TestAssets\StartupHookForFunctionalTest\StartupHookForFunctionalTest.csproj">
+        <Private>true</Private>
+      </ProjectReference>
   </ItemGroup>
 </Project>

From 740d8294ee607fdc9d60df3783fbdaacdf913228 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 5 Apr 2023 15:48:02 -0400
Subject: [PATCH 3/3] Delete artifacts only if an apk has been created

---
 eng/testing/tests.android.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/tests.android.targets b/eng/testing/tests.android.targets
index f29c29c30edd9..3c3eb46fa28eb 100644
--- a/eng/testing/tests.android.targets
+++ b/eng/testing/tests.android.targets
@@ -70,7 +70,7 @@
           SkipUnchangedFiles="true"
           Condition="'$(ArchiveTests)' == 'true' and '$(IgnoreForCI)' != 'true'" />
 
-    <RemoveDir Condition="'$(ArchiveTests)' == 'true'" Directories="$(OutDir)" />
+    <RemoveDir Condition="'$(ArchiveTests)' == 'true' and '$(AndroidGenerateAppBundle)' == 'true'" Directories="$(OutDir)" />
   </Target>
 
 </Project>
\ No newline at end of file