Skip to content

Commit 08caa7f

Browse files
authored
Update swift-android-testing-release.patch to delete it
1 parent 50ba1cd commit 08caa7f

File tree

1 file changed

+1
-61
lines changed

1 file changed

+1
-61
lines changed
Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1 @@
1-
diff --git a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
2-
index b6bfa5760ef..324d1a77eea 100644
3-
--- a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
4-
+++ b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
5-
@@ -51,7 +51,7 @@ class SwiftTesting(product.Product):
6-
return False
7-
8-
def should_install(self, host_target):
9-
- return self.args.install_swift_testing_macros
10-
+ return self.args.install_swift_testing
11-
12-
def _cmake_product(self, host_target):
13-
build_root = os.path.dirname(self.build_dir)
14-
diff --git a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
15-
index 90f4aa78..0429425b 100644
16-
--- a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
17-
+++ b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
18-
@@ -1948,7 +1948,7 @@ CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
19-
#endif
20-
}
21-
22-
-#if TARGET_OS_ANDROID
23-
+#if TARGET_OS_ANDROID && __ANDROID_API__ < 28
24-
25-
#include <dlfcn.h>
26-
#include <spawn.h>
27-
@@ -2277,6 +2277,10 @@ CF_EXPORT int _CFPosixSpawnFileActionsAddClose(_CFPosixSpawnFileActionsRef file_
28-
return _CFPosixSpawnFileActionsAddCloseImpl(file_actions, filedes);
29-
}
30-
31-
+CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_actions, const char *path) {
32-
+ return ENOSYS;
33-
+}
34-
+
35-
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]) {
36-
_CFPosixSpawnInitialize();
37-
return _CFPosixSpawnImpl(pid, path, file_actions, attrp, argv, envp);
38-
@@ -2279,7 +2279,7 @@ CF_EXPORT int _CFPosixSpawnFileActionsAddClose(_CFPosixSpawnFileActionsRef file_
39-
}
40-
41-
CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_actions, const char *path) {
42-
- #if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 29)
43-
+ #if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 29) || (defined(__ANDROID__) && __ANDROID_API__ < 34)
44-
// Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
45-
// - Amazon Linux 2 (EoL mid-2025)
46-
return ENOSYS;
47-
diff --git a/swift-testing/cmake/modules/SwiftModuleInstallation.cmake b/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
48-
index 1553725..d9f9e5b 100644
49-
--- a/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
50-
+++ b/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
51-
@@ -75,6 +75,10 @@ function(_swift_testing_install_target module)
52-
set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
53-
if(CMAKE_Swift_COMPILER_TARGET)
54-
list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET})
55-
+ else()
56-
+ set(arg_list ${CMAKE_Swift_FLAGS})
57-
+ separate_arguments(arg_list)
58-
+ list(APPEND module_triple_command ${arg_list})
59-
endif()
60-
execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
61-
string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple")
1+

0 commit comments

Comments
 (0)