From 7503fa8b22a2e730286dddef128d5a196a0817f1 Mon Sep 17 00:00:00 2001
From: Finagolfin <finagolfin@tuta.io>
Date: Mon, 16 Feb 2026 13:35:19 +0530
Subject: [PATCH 1/4] Android: push trunk build back to API 24

---
 swift-ci/sdks/android/build-docker     | 5 +++++
 swift-ci/sdks/android/build-local      | 5 +++++
 swift-ci/sdks/android/scripts/build.sh | 1 +
 3 files changed, 11 insertions(+)

diff --git a/swift-ci/sdks/android/build-docker b/swift-ci/sdks/android/build-docker
index 3b88952c..4e72b6fa 100755
--- a/swift-ci/sdks/android/build-docker
+++ b/swift-ci/sdks/android/build-docker
@@ -33,6 +33,11 @@ fi
 mkdir -p ${WORKDIR}
 WORKDIR=$(realpath ${WORKDIR})
 
+# Push trunk back to build against Android API 24
+if [[ -n "${SWIFT_VERSION}" && ($SWIFT_VERSION == scheme:main || $SWIFT_VERSION == tag:swift-DEV*) ]]; then
+    ANDROID_API=24
+fi
+
 HOST_OS=ubuntu24.04
 source ./scripts/toolchain-vars.sh
 
diff --git a/swift-ci/sdks/android/build-local b/swift-ci/sdks/android/build-local
index b5f078c5..b8b7514f 100755
--- a/swift-ci/sdks/android/build-local
+++ b/swift-ci/sdks/android/build-local
@@ -33,6 +33,11 @@ fi
 mkdir -p ${WORKDIR}
 WORKDIR=$(realpath ${WORKDIR})
 
+# Push trunk back to build against Android API 24
+if [[ -n "${SWIFT_VERSION}" && ($SWIFT_VERSION == scheme:main || $SWIFT_VERSION == tag:swift-DEV*) ]]; then
+    ANDROID_API=24
+fi
+
 HOST_OS=ubuntu$(lsb_release -sr)
 source ./scripts/toolchain-vars.sh
 
diff --git a/swift-ci/sdks/android/scripts/build.sh b/swift-ci/sdks/android/scripts/build.sh
index b36f08ba..833faa77 100755
--- a/swift-ci/sdks/android/scripts/build.sh
+++ b/swift-ci/sdks/android/scripts/build.sh
@@ -351,6 +351,7 @@ for arch in $archs; do
             -DLIBXML2_WITH_ICU=NO \
             -DLIBXML2_WITH_ICONV=NO \
             -DLIBXML2_WITH_LZMA=NO \
+            -DLIBXML2_WITH_TESTS=OFF \
             -DBUILD_SHARED_LIBS=OFF \
             -DBUILD_STATIC_LIBS=ON
 

From be69b77c9c008d5676b54eef298b4f058ae48674 Mon Sep 17 00:00:00 2001
From: Finagolfin <finagolfin@tuta.io>
Date: Mon, 16 Feb 2026 13:52:01 +0530
Subject: [PATCH 2/4] Android: stop rebuilding the corelibs for the linux host
 each time a new Android arch is built

---
 swift-ci/sdks/android/scripts/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/swift-ci/sdks/android/scripts/build.sh b/swift-ci/sdks/android/scripts/build.sh
index 833faa77..39135729 100755
--- a/swift-ci/sdks/android/scripts/build.sh
+++ b/swift-ci/sdks/android/scripts/build.sh
@@ -487,6 +487,7 @@ for arch in $archs; do
             --host-test \
             --skip-test-linux \
             --skip-test-xctest --skip-test-foundation \
+            --skip-clean-libdispatch --skip-clean-foundation --skip-clean-xctest \
             --build-swift-static-stdlib \
             --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' \
             --install-swift \

From 7c7056fb2d6d743efdf69c5ec2489d774312e0eb Mon Sep 17 00:00:00 2001
From: Finagolfin <finagolfin@tuta.io>
Date: Wed, 11 Mar 2026 01:55:50 +0530
Subject: [PATCH 3/4] Android: Update trunk branch to NDK 28c

Temporarily disable a handful of trunk tests that now fail.
---
 swift-ci/sdks/android/build-docker | 17 ++++++++++++-----
 swift-ci/sdks/android/build-local  | 12 +++++++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/swift-ci/sdks/android/build-docker b/swift-ci/sdks/android/build-docker
index 4e72b6fa..bf1cffc8 100755
--- a/swift-ci/sdks/android/build-docker
+++ b/swift-ci/sdks/android/build-docker
@@ -33,11 +33,6 @@ fi
 mkdir -p ${WORKDIR}
 WORKDIR=$(realpath ${WORKDIR})
 
-# Push trunk back to build against Android API 24
-if [[ -n "${SWIFT_VERSION}" && ($SWIFT_VERSION == scheme:main || $SWIFT_VERSION == tag:swift-DEV*) ]]; then
-    ANDROID_API=24
-fi
-
 HOST_OS=ubuntu24.04
 source ./scripts/toolchain-vars.sh
 
@@ -54,6 +49,18 @@ perl -pi -g -we "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2i
 # disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
 perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' ${WORKDIR}/source/swift-project/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
 
+# Push trunk back to build against Android API 24 with NDK 28c
+if [[ -n "${SWIFT_VERSION}" && ($SWIFT_VERSION == scheme:main || $SWIFT_VERSION == tag:swift-DEV*) ]]; then
+    ANDROID_NDK_VERSION=android-ndk-r28c
+    ANDROID_API=24
+
+    rm ${WORKDIR}/source/swift-project/swift/test/Interop/Cxx/class/invalid-members/stdlib-containers-of-incomplete.swift
+    rm ${WORKDIR}/source/swift-project/swift/test/Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp
+    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_decoding_packs.swift
+    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering.swift
+    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering_packs.swift
+fi
+
 mkdir -p ${WORKDIR}/products
 chmod ugo+rwx ${WORKDIR}/products
 
diff --git a/swift-ci/sdks/android/build-local b/swift-ci/sdks/android/build-local
index b8b7514f..1f51d1a0 100755
--- a/swift-ci/sdks/android/build-local
+++ b/swift-ci/sdks/android/build-local
@@ -33,8 +33,9 @@ fi
 mkdir -p ${WORKDIR}
 WORKDIR=$(realpath ${WORKDIR})
 
-# Push trunk back to build against Android API 24
+# Push trunk back to build against Android API 24 with NDK 28c
 if [[ -n "${SWIFT_VERSION}" && ($SWIFT_VERSION == scheme:main || $SWIFT_VERSION == tag:swift-DEV*) ]]; then
+    ANDROID_NDK_VERSION=android-ndk-r28c
     ANDROID_API=24
 fi
 
@@ -76,6 +77,15 @@ perl -pi -g -we "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2i
 # disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
 perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' ${WORKDIR}/source/swift-project/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
 
+# Disable failing trunk tests when building against NDK 28c
+if [[ -n "${SWIFT_VERSION}" && ($SWIFT_VERSION == scheme:main || $SWIFT_VERSION == tag:swift-DEV*) ]]; then
+    rm ${WORKDIR}/source/swift-project/swift/test/Interop/Cxx/class/invalid-members/stdlib-containers-of-incomplete.swift
+    rm ${WORKDIR}/source/swift-project/swift/test/Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp
+    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_decoding_packs.swift
+    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering.swift
+    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering_packs.swift
+fi
+
 mkdir -p ${WORKDIR}/products
 
 ./scripts/build.sh \

From 512c072a9f0961c40b5e8721592d8f28a83ed138 Mon Sep 17 00:00:00 2001
From: Finagolfin <finagolfin@tuta.io>
Date: Mon, 23 Mar 2026 06:44:49 +0530
Subject: [PATCH 4/4] Android: delete build directories that are causing
 duplicate swiftmodules to be installed

---
 swift-ci/sdks/android/scripts/build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/swift-ci/sdks/android/scripts/build.sh b/swift-ci/sdks/android/scripts/build.sh
index 39135729..af6d7e1a 100755
--- a/swift-ci/sdks/android/scripts/build.sh
+++ b/swift-ci/sdks/android/scripts/build.sh
@@ -502,10 +502,12 @@ for arch in $archs; do
             --cross-compile-append-host-target-to-destdir=False 
             # --extra-cmake-options='-DCMAKE_EXTRA_LINK_FLAGS="-Wl,-z,max-page-size=16384"'
         # need to remove the arch-specific portion of the Swift resource dir in
-        # the build directory, through this symlink that we create in the NDK to
+        # the build directories, through this symlink that we create in the NDK to
         # the build directory, or else we get errors like:
-        # error: could not find module '_Builtin_float' for target 'x86_64-unknown-linux-android'; found: aarch64-unknown-linux-android, at: /home/runner/work/_temp/swift-android-sdk/ndk/android-ndk-r27c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift/android/_Builtin_float.swiftmodule
+        # error: could not find module '_Builtin_float' for target 'x86_64-unknown-linux-android'; found: aarch64-unknown-linux-android, at: /home/runner/work/_temp/swift-android-sdk/ndk/android-ndk-r28c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift/android/_Builtin_float.swiftmodule
         rm -rf $ndk_installation/sysroot/usr/lib/swift/android
+        rm -rf $ndk_installation/sysroot/usr/lib/swift/../swift_static/android
+        rm -rf $ndk_installation/sysroot/usr/lib/swift/../../../swift-linux-x86_64/lib/swift{,_static}/android
     quiet_popd
     groupend
 done