Only apply build-script patch on CI to other branches since it was upstreamed to trunk

Author: finagolfin

.github/workflows/sdks.yml

@@ -132,6 +132,7 @@ jobs:
             perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
           else
             if [ ${{ matrix.version }} = 'devel' ]; then
+              git apply swift-android-devel.patch
               perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
             fi
             git apply swift-android-ci-except-release.patch swift-android-foundation-except-release.patch

swift-android-devel.patch

@@ -0,0 +1,40 @@
+diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
+index 16e05052609..114e768bdbb 100755
+--- a/swift/utils/build-script-impl
++++ b/swift/utils/build-script-impl
+@@ -2409,6 +2409,11 @@ for host in "${ALL_HOSTS[@]}"; do
+                     continue
+                 fi
+ 
++                if [[ "${BUILD_SWIFT_TOOLS}" == "0" ]]; then
++                    echo "Skipping building Foundation Macros for ${host}, because the host tools are not being built"
++                    continue
++                fi
++
+                 if [[ "${SKIP_CLEAN_FOUNDATION}" == "0" ]]
+                 then
+                   # The Swift project might have been changed, but CMake might
+@@ -2558,11 +2563,6 @@ for host in "${ALL_HOSTS[@]}"; do
+                         -DCMAKE_FIND_ROOT_PATH:PATH="${CROSS_COMPILE_DEPS_PATH}"
+                     )
+                 fi
+-                if [[ "${host}" == "android-"* ]]; then
+-                    cmake_options+=(
+-                        -DCMAKE_HAVE_LIBC_PTHREAD=True
+-                    )
+-                fi
+                 ;;
+             libdispatch|libdispatch_static)
+                 LIBDISPATCH_BUILD_DIR=$(build_directory ${host} ${product})
+@@ -3009,6 +3009,11 @@ for host in "${ALL_HOSTS[@]}"; do
+                     continue
+                 fi
+ 
++                if [[ "${BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then
++                    echo "Skipping installing Foundation Macros for ${host}, because the host tools are not being built"
++                    continue
++                fi
++
+                 if [[ -z "${INSTALL_FOUNDATION}" ]] ; then
+                     continue
+                 fi

swift-android-foundation-release.patch

@@ -15,6 +15,46 @@ index 78e7bda9976..dc25e5c3668 100644
  module _bits_stdatomic [system] {
    // Note: this module is not part of 'stdatomic'
    // as it depends on libc++ and forcing it to
+diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
+index 16e05052609..114e768bdbb 100755
+--- a/swift/utils/build-script-impl
++++ b/swift/utils/build-script-impl
+@@ -2409,6 +2409,11 @@ for host in "${ALL_HOSTS[@]}"; do
+                     continue
+                 fi
+ 
++                if [[ "${BUILD_SWIFT_TOOLS}" == "0" ]]; then
++                    echo "Skipping building Foundation Macros for ${host}, because the host tools are not being built"
++                    continue
++                fi
++
+                 if [[ "${SKIP_CLEAN_FOUNDATION}" == "0" ]]
+                 then
+                   # The Swift project might have been changed, but CMake might
+@@ -2558,11 +2563,6 @@ for host in "${ALL_HOSTS[@]}"; do
+                         -DCMAKE_FIND_ROOT_PATH:PATH="${CROSS_COMPILE_DEPS_PATH}"
+                     )
+                 fi
+-                if [[ "${host}" == "android-"* ]]; then
+-                    cmake_options+=(
+-                        -DCMAKE_HAVE_LIBC_PTHREAD=True
+-                    )
+-                fi
+                 ;;
+             libdispatch|libdispatch_static)
+                 LIBDISPATCH_BUILD_DIR=$(build_directory ${host} ${product})
+@@ -3009,6 +3009,11 @@ for host in "${ALL_HOSTS[@]}"; do
+                     continue
+                 fi
+ 
++                if [[ "${BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then
++                    echo "Skipping installing Foundation Macros for ${host}, because the host tools are not being built"
++                    continue
++                fi
++
+                 if [[ -z "${INSTALL_FOUNDATION}" ]] ; then
+                     continue
+                 fi
 diff --git a/swift-corelibs-foundation/Package.swift b/swift-corelibs-foundation/Package.swift
 --- a/swift-corelibs-foundation/Package.swift
 +++ b/swift-corelibs-foundation/Package.swift

swift-android.patch

@@ -1,43 +1,3 @@
-diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
-index 16e05052609..114e768bdbb 100755
---- a/swift/utils/build-script-impl
-+++ b/swift/utils/build-script-impl
-@@ -2409,6 +2409,11 @@ for host in "${ALL_HOSTS[@]}"; do
-                     continue
-                 fi
- 
-+                if [[ "${BUILD_SWIFT_TOOLS}" == "0" ]]; then
-+                    echo "Skipping building Foundation Macros for ${host}, because the host tools are not being built"
-+                    continue
-+                fi
-+
-                 if [[ "${SKIP_CLEAN_FOUNDATION}" == "0" ]]
-                 then
-                   # The Swift project might have been changed, but CMake might
-@@ -2558,11 +2563,6 @@ for host in "${ALL_HOSTS[@]}"; do
-                         -DCMAKE_FIND_ROOT_PATH:PATH="${CROSS_COMPILE_DEPS_PATH}"
-                     )
-                 fi
--                if [[ "${host}" == "android-"* ]]; then
--                    cmake_options+=(
--                        -DCMAKE_HAVE_LIBC_PTHREAD=True
--                    )
--                fi
-                 ;;
-             libdispatch|libdispatch_static)
-                 LIBDISPATCH_BUILD_DIR=$(build_directory ${host} ${product})
-@@ -3009,6 +3009,11 @@ for host in "${ALL_HOSTS[@]}"; do
-                     continue
-                 fi
- 
-+                if [[ "${BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then
-+                    echo "Skipping installing Foundation Macros for ${host}, because the host tools are not being built"
-+                    continue
-+                fi
-+
-                 if [[ -z "${INSTALL_FOUNDATION}" ]] ; then
-                     continue
-                 fi
 diff --git a/swift-corelibs-foundation/CMakeLists.txt b/swift-corelibs-foundation/CMakeLists.txt
 index 7f290d16..95366592 100644
 --- a/swift-corelibs-foundation/CMakeLists.txt