Stop applying Foundation patch that was upstreamed to trunk branch on the CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -132,6 +132,8 @@ jobs:
           else
             if ${{ matrix.version == 'trunk' }}; then
               git apply swift-android-trunk-libdispatch.patch
+            else
+              git apply swift-android-devel.patch
             fi
             git apply -C2 swift-android-ci-except-release.patch swift-android-testing-except-release.patch
             SDK_NAME=$(ls | grep swift-${{ matrix.version }}-android-aarch64)

swift-android-devel.patch

@@ -0,0 +1,40 @@
+diff --git a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
+index 5769a3317e..916a7accbb 100644
+--- a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
++++ b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
+@@ -1948,7 +1948,7 @@ CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
+ #endif
+ }
+ 
+-#if TARGET_OS_ANDROID
++#if TARGET_OS_ANDROID && __ANDROID_API__ < 28
+ 
+ #include <dlfcn.h>
+ #include <spawn.h>
+@@ -2277,6 +2277,10 @@ CF_EXPORT int _CFPosixSpawnFileActionsAddClose(_CFPosixSpawnFileActionsRef file_
+     return _CFPosixSpawnFileActionsAddCloseImpl(file_actions, filedes);
+ }
+ 
++CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_actions, const char *path) {
++  return ENOSYS;
++}
++
+ CF_EXPORT int _CFPosixSpawn(pid_t *_CF_RESTRICT pid, const char *_CF_RESTRICT path, _CFPosixSpawnFileActionsRef file_actions, _CFPosixSpawnAttrRef _Nullable _CF_RESTRICT attrp, char *_Nullable const argv[_Nullable _CF_RESTRICT], char *_Nullable const envp[_Nullable _CF_RESTRICT]) {
+     _CFPosixSpawnInitialize();
+     return _CFPosixSpawnImpl(pid, path, file_actions, attrp, argv, envp);
+@@ -2317,12 +2317,13 @@ CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_act
+   // Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
+   //  - Amazon Linux 2 (EoL mid-2025)
+   return ENOSYS;
+-  #elif defined(__OpenBSD__) || defined(__QNX__)
++  #elif defined(__OpenBSD__) || defined(__QNX__) || (defined(__ANDROID__) && __ANDROID_API__ < 34)
+   // Currently missing as of:
+   //  - OpenBSD 7.5 (April 2024)
+   //  - QNX 8 (December 2023)
++  //  - Android 13
+   return ENOSYS;
+-  #elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || (defined(__ANDROID__) && __ANDROID_API__ >= 34) || defined(__musl__)
++  #elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__musl__)
+   // Pre-standard posix_spawn_file_actions_addchdir_np version available in:
+   //  - Solaris 11.3 (October 2015)
+   //  - Glibc 2.29 (February 2019)

swift-android-testing-except-release.patch

@@ -1,23 +1,3 @@
-diff --git a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-index 5769a3317e..916a7accbb 100644
---- a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-+++ b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-@@ -2317,12 +2317,13 @@ CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_act
-   // Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
-   //  - Amazon Linux 2 (EoL mid-2025)
-   return ENOSYS;
--  #elif defined(__OpenBSD__) || defined(__QNX__)
-+  #elif defined(__OpenBSD__) || defined(__QNX__) || (defined(__ANDROID__) && __ANDROID_API__ < 34)
-   // Currently missing as of:
-   //  - OpenBSD 7.5 (April 2024)
-   //  - QNX 8 (December 2023)
-+  //  - Android 13
-   return ENOSYS;
--  #elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || (defined(__ANDROID__) && __ANDROID_API__ >= 34) || defined(__musl__)
-+  #elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__musl__)
-   // Pre-standard posix_spawn_file_actions_addchdir_np version available in:
-   //  - Solaris 11.3 (October 2015)
-   //  - Glibc 2.29 (February 2019)
 diff --git a/swift-corelibs-xctest/cmake/modules/PlatformInfo.cmake b/swift-corelibs-xctest/cmake/modules/PlatformInfo.cmake
 index 468dc61..a90ae3d 100644
 --- a/swift-corelibs-xctest/cmake/modules/PlatformInfo.cmake

swift-android-testing-release.patch

@@ -15,6 +15,26 @@ diff --git a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c b/swi
 index 90f4aa78..0429425b 100644
 --- a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
 +++ b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
+@@ -1948,7 +1948,7 @@ CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
+ #endif
+ }
+ 
+-#if TARGET_OS_ANDROID
++#if TARGET_OS_ANDROID && __ANDROID_API__ < 28
+ 
+ #include <dlfcn.h>
+ #include <spawn.h>
+@@ -2277,6 +2277,10 @@ CF_EXPORT int _CFPosixSpawnFileActionsAddClose(_CFPosixSpawnFileActionsRef file_
+     return _CFPosixSpawnFileActionsAddCloseImpl(file_actions, filedes);
+ }
+ 
++CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_actions, const char *path) {
++  return ENOSYS;
++}
++
+ CF_EXPORT int _CFPosixSpawn(pid_t *_CF_RESTRICT pid, const char *_CF_RESTRICT path, _CFPosixSpawnFileActionsRef file_actions, _CFPosixSpawnAttrRef _Nullable _CF_RESTRICT attrp, char *_Nullable const argv[_Nullable _CF_RESTRICT], char *_Nullable const envp[_Nullable _CF_RESTRICT]) {
+     _CFPosixSpawnInitialize();
+     return _CFPosixSpawnImpl(pid, path, file_actions, attrp, argv, envp);
 @@ -2279,7 +2279,7 @@ CF_EXPORT int _CFPosixSpawnFileActionsAddClose(_CFPosixSpawnFileActionsRef file_
  }
 

swift-android.patch

@@ -59,30 +59,6 @@ index 7f290d16..95366592 100644
  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-diff --git a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-index 5769a331..238f2ecb 100644
---- a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-+++ b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-@@ -1948,7 +1948,7 @@ CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
- #endif
- }
- 
--#if TARGET_OS_ANDROID
-+#if TARGET_OS_ANDROID && __ANDROID_API__ < 28
- 
- #include <dlfcn.h>
- #include <spawn.h>
-@@ -2277,6 +2277,10 @@ CF_EXPORT int _CFPosixSpawnFileActionsAddClose(_CFPosixSpawnFileActionsRef file_
-     return _CFPosixSpawnFileActionsAddCloseImpl(file_actions, filedes);
- }
- 
-+CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_actions, const char *path) {
-+  return ENOSYS;
-+}
-+
- CF_EXPORT int _CFPosixSpawn(pid_t *_CF_RESTRICT pid, const char *_CF_RESTRICT path, _CFPosixSpawnFileActionsRef file_actions, _CFPosixSpawnAttrRef _Nullable _CF_RESTRICT attrp, char *_Nullable const argv[_Nullable _CF_RESTRICT], char *_Nullable const envp[_Nullable _CF_RESTRICT]) {
-     _CFPosixSpawnInitialize();
-     return _CFPosixSpawnImpl(pid, path, file_actions, attrp, argv, envp);
 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