From 7515261fb8bbb6990b83e5bf84a5e86bf8a70490 Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Tue, 9 Jun 2026 10:59:49 +0530 Subject: [PATCH 1/2] Don't build the embedded stdlib on Android CI --- 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 af6d7e1a..d4239a4a 100755 --- a/swift-ci/sdks/android/scripts/build.sh +++ b/swift-ci/sdks/android/scripts/build.sh @@ -496,6 +496,7 @@ for arch in $archs; do --xctest --install-xctest \ --swift-testing --install-swift-testing \ --swift-testing-macros --install-swift-testing-macros \ + --build-embedded-stdlib=False \ --cross-compile-build-swift-tools=False \ --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS= \ --foundation-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS= \ From 33d77b570db9fefcdb9eea1caa5938008ec9e3aa Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Fri, 12 Jun 2026 18:20:27 +0530 Subject: [PATCH 2/2] The SwiftBridging header has been moved to the Swift-forked clang resource directory instead, so don't copy it for Android in trunk --- swift-ci/sdks/android/scripts/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift-ci/sdks/android/scripts/build.sh b/swift-ci/sdks/android/scripts/build.sh index d4239a4a..ebf60ff7 100755 --- a/swift-ci/sdks/android/scripts/build.sh +++ b/swift-ci/sdks/android/scripts/build.sh @@ -654,7 +654,10 @@ for arch in $archs; do quiet_pushd ${sdk_staging}/${arch}/usr rm -rf bin lib/clang local rm -r include/* - cp -r ${swift_source_dir}/swift/lib/ClangImporter/SwiftBridging/{module.modulemap,swift} include/ + # No longer needed in trunk snapshots and PRs + if [[ $swift_version != DEVELOPMENT-SNAPSHOT-* && $swift_version != PR ]]; then + cp -r ${swift_source_dir}/swift/lib/ClangImporter/SwiftBridging/{module.modulemap,swift} include/ + fi arch_triple="$arch-linux-android" if [[ $arch == 'armv7' ]]; then