Update Foundation patch on CI for upstream change

Author: finagolfin

.github/workflows/sdks.yml

@@ -134,7 +134,7 @@ jobs:
             if ${{ matrix.version == 'trunk' }}; then
               git apply swift-android-trunk-libdispatch.patch
             else
-              git apply swift-android-ci-devel.patch
+              git apply swift-android-ci-devel.patch swift-android-devel.patch
             fi
             git apply -C2 swift-android-ci-except-release.patch
             BUILD_FLAG="--cross-compile-build-swift-tools=0"

swift-android-devel.patch

@@ -0,0 +1,15 @@
+diff --git a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+index 016bf294..5c42986a 100644
+--- a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
++++ b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+@@ -162,6 +162,10 @@ if(NOT BUILD_SHARED_LIBS)
+         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend _FoundationICU>")
+     target_compile_options(Foundation PRIVATE
+         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend swiftSynchronization>")
++    if(${CMAKE_SYSTEM_NAME} STREQUAL Android)
++      target_compile_options(Foundation PRIVATE
++          "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend android-spawn>")
++    endif()
+ endif()
+ 
+ if(dispatch_FOUND)

swift-android-testing-release.patch

@@ -58,3 +58,18 @@ index 90f4aa78..0429425b 100644
    // Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
    //  - Amazon Linux 2 (EoL mid-2025)
    return ENOSYS;
+diff --git a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+index 016bf294..5c42986a 100644
+--- a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
++++ b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+@@ -162,6 +162,10 @@ if(NOT BUILD_SHARED_LIBS)
+         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend _FoundationICU>")
+     target_compile_options(Foundation PRIVATE
+         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend swiftSynchronization>")
++    if(${CMAKE_SYSTEM_NAME} STREQUAL Android)
++      target_compile_options(Foundation PRIVATE
++          "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend android-spawn>")
++    endif()
+ endif()
+ 
+ set_target_properties(Foundation PROPERTIES

swift-android-trunk-libdispatch.patch

@@ -1,3 +1,18 @@
+diff --git a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+index 016bf294..5c42986a 100644
+--- a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
++++ b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+@@ -162,6 +162,10 @@ if(NOT BUILD_SHARED_LIBS)
+         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend _FoundationICU>")
+     target_compile_options(Foundation PRIVATE
+         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend $<$<PLATFORM_ID:Windows>:${CMAKE_STATIC_LIBRARY_PREFIX_Swift}>swiftSynchronization>")
++    if(${CMAKE_SYSTEM_NAME} STREQUAL Android)
++      target_compile_options(Foundation PRIVATE
++          "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend android-spawn>")
++    endif()
+ endif()
+ 
+ if(dispatch_FOUND)
 diff --git a/swift-corelibs-libdispatch/src/swift/CMakeLists.txt b/swift-corelibs-libdispatch/src/swift/CMakeLists.txt
 index 38bef37..d0ddf98 100644
 --- a/swift-corelibs-libdispatch/src/swift/CMakeLists.txt

swift-android.patch

@@ -65,17 +65,6 @@ diff --git a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt b/swift
 index 016bf294..5c42986a 100644
 --- a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
 +++ b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
-@@ -162,6 +162,10 @@ if(NOT BUILD_SHARED_LIBS)
-         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend _FoundationICU>")
-     target_compile_options(Foundation PRIVATE
-         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend swiftSynchronization>")
-+    if(${CMAKE_SYSTEM_NAME} STREQUAL Android)
-+      target_compile_options(Foundation PRIVATE
-+          "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend android-spawn>")
-+    endif()
- endif()
- 
- set_target_properties(Foundation PROPERTIES
 @@ -174,6 +174,12 @@
      target_link_libraries(Foundation PUBLIC
          swiftDispatch)