From f22ef270de085776d4cd393f572cffe55385285e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= <stefan.graenitz@gmail.com>
Date: Thu, 6 Feb 2025 12:40:31 +0100
Subject: [PATCH 1/3] [dev] Temporarily enable Android aarch64 Swift runtime
 and disable tests

---
 utils/build-windows-toolchain.bat | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat
index 131c283eddc1e..464631df39034 100644
--- a/utils/build-windows-toolchain.bat
+++ b/utils/build-windows-toolchain.bat
@@ -60,7 +60,7 @@ set TMPDIR=%BuildRoot%\tmp
 set NINJA_STATUS=[%%f/%%t][%%p][%%es] 
 
 :: Build the -Test argument, if any, by subtracting skipped tests
-set TestArg=-Test lld,lldb,swift,dispatch,foundation,xctest,swift-format,sourcekit-lsp,
+set TestArg= 
 for %%I in (%SKIP_TESTS%) do (call set TestArg=%%TestArg:%%I,=%%)
 if "%TestArg:~-1%"=="," (set TestArg=%TestArg:~0,-1%) else (set TestArg= )
 
@@ -77,6 +77,8 @@ powershell.exe -ExecutionPolicy RemoteSigned -File %~dp0build.ps1 ^
   -ImageRoot %BuildRoot% ^
   %SkipPackagingArg% ^
   %TestArg% ^
+  -AndroidSDKs aarch64 ^
+  -WindowsSDKs X64 ^
   -Stage %PackageRoot% ^
   -Summary || (exit /b 1)
 

From 6935260c33910717018da9f3a6c919f099ddc675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= <stefan.graenitz@gmail.com>
Date: Fri, 7 Mar 2025 14:24:35 +0100
Subject: [PATCH 2/3] Test temporary workaround: drop all *.swiftinterface
 files from Android SDK

---
 utils/build.ps1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/utils/build.ps1 b/utils/build.ps1
index 0c9e0329d6941..1dee087db2d9c 100644
--- a/utils/build.ps1
+++ b/utils/build.ps1
@@ -3233,6 +3233,10 @@ if (-not $SkipBuild) {
     # Build platform: SDK, Redist and XCTest
     Invoke-BuildStep Build-Runtime Android $Arch
     Invoke-BuildStep Build-Dispatch Android $Arch
+
+    # FIXME
+    Get-ChildItem -Path $AndroidX64.SDKInstallRoot -Filter "*.swiftinterface" -Recurse | Remove-Item -Force
+
     Invoke-BuildStep Build-Foundation Android $Arch
     Invoke-BuildStep Build-Sanitizers Android $Arch
     Invoke-BuildStep Build-XCTest Android $Arch

From 148bc8c40fa41b5b701098fefe36cef14afd5204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= <stefan.graenitz@gmail.com>
Date: Fri, 7 Mar 2025 16:35:13 +0100
Subject: [PATCH 3/3] fixup! Test temporary workaround: drop all
 *.swiftinterface files from Android SDK

---
 utils/build.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/build.ps1 b/utils/build.ps1
index 1dee087db2d9c..56e78c6b02234 100644
--- a/utils/build.ps1
+++ b/utils/build.ps1
@@ -3235,7 +3235,7 @@ if (-not $SkipBuild) {
     Invoke-BuildStep Build-Dispatch Android $Arch
 
     # FIXME
-    Get-ChildItem -Path $AndroidX64.SDKInstallRoot -Filter "*.swiftinterface" -Recurse | Remove-Item -Force
+    Get-ChildItem -Path "$(Get-TargetProjectBinaryCache $Arch Runtime)\lib\swift" -Filter "*.swiftinterface" -Recurse
 
     Invoke-BuildStep Build-Foundation Android $Arch
     Invoke-BuildStep Build-Sanitizers Android $Arch