Update CI checkouts and patches for new devel 6.2 branch

Author: finagolfin

.github/workflows/sdks.yml

@@ -31,7 +31,7 @@ jobs:
             SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
           fi
           echo "tag=$SWIFT_TAG" >> $GITHUB_OUTPUT
-          echo "key=$SWIFT_TAG-ndk-${NDK_VERSION}-patch-bundle" >> $GITHUB_OUTPUT
+          echo "key=$SWIFT_TAG-ndk-${NDK_VERSION}-parch-bundle" >> $GITHUB_OUTPUT
       - name: Get cached SDK bundle
         id: cache-bundle
         uses: actions/cache/restore@v4
@@ -126,14 +126,14 @@ jobs:
             ANDROID_ARCH=$arch BUILD_SWIFT_PM=1 ${TOOLCHAIN}/bin/swift get-packages-and-swift-source.swift
           done
 
-          git apply swift-android.patch swift-crypto.patch swift-system.patch
-          git apply -C1 swift-android-ci.patch
-          if [ ${{ matrix.version }} != 'trunk' ]; then
+          git apply swift-android.patch
+          git apply swift-android-ci.patch
+          if ${{ matrix.version == 'release' }}; then
             perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
             LSP_BUILD="-p --sourcekit-lsp"
-            git apply swift-android-testing-devel.patch
+            git apply swift-android-ci-release.patch swift-android-testing-release.patch
           else
-            git apply swift-android-trunk.patch
+            git apply swift-android-ci-except-release.patch swift-android-testing-except-release.patch
           fi
 
           perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift

get-packages-and-swift-source.swift

@@ -17,7 +17,7 @@ let extraSwiftRepos = ["swift-llbuild", "swift-package-manager", "swift-driver",
                        "swift-certificates", "swift-asn1", "swift-toolchain-sqlite"]
 let appleRepos = ["swift-argument-parser", "swift-crypto", "swift-system", "swift-collections", "swift-certificates", "swift-asn1"]
 let renameRepos = ["swift-llbuild" : "llbuild", "swift-package-manager" : "swiftpm", "Yams" : "yams"]
-var repoTags = ["swift-system" : "1.3.0", "swift-collections" : "1.1.3", "swift-asn1" : "1.0.0",
+var repoTags = ["swift-system" : "1.4.1", "swift-collections" : "1.1.3", "swift-asn1" : "1.0.0",
                 "swift-certificates" : "1.0.1", "Yams" : "5.0.6", "swift-argument-parser" : "1.4.0",
                 "swift-crypto" : "3.0.0", "swift-toolchain-sqlite" : "1.0.1"]
 if ProcessInfo.processInfo.environment["BUILD_SWIFT_PM"] != nil {
@@ -53,6 +53,7 @@ if tagExtract.numberOfMatches(in: SWIFT_TAG, range: tagRange) == 1 {
 }
 
 if swiftBranch == "RELEASE" {
+  repoTags["swift-system"] = "1.3.0"
   sdkDir = "swift-release-android-\(ANDROID_ARCH)-24-sdk"
 } else {
   sdkDir = "swift-\(swiftVersion == "" ? "trunk" : "devel")-android-\(ANDROID_ARCH)-\(swiftSnapshotDate)-24-sdk"

swift-android-ci-except-release.patch

@@ -0,0 +1,32 @@
+diff --git a/sourcekit-lsp/Utilities/build-script-helper.py b/sourcekit-lsp/Utilities/build-script-helper.py
+index 88141cdd..d264f10c 100755
+--- a/sourcekit-lsp/Utilities/build-script-helper.py
++++ b/sourcekit-lsp/Utilities/build-script-helper.py
+@@ -136,9 +136,6 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace, suppress_verb
+     if '-android' in build_target:
+         swiftpm_args += [
+             '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android',
++            '-Xlinker', '-landroid-spawn',
+-            # SwiftPM will otherwise try to compile against GNU strerror_r on
+-            '-Xlinker', '-landroid-spawn',
+-            # Android and fail.
+-            '-Xswiftc', '-Xcc', '-Xswiftc', '-U_GNU_SOURCE',
+         ]
+     elif not build_os.startswith('macosx'):
+         # Library rpath for swift, dispatch, Foundation, etc. when installing
+diff --git a/swiftpm/Utilities/bootstrap b/swiftpm/Utilities/bootstrap
+index 156bf002a..d891da556 100755
+--- a/swiftpm/Utilities/bootstrap
++++ b/swiftpm/Utilities/bootstrap
+@@ -934,10 +934,7 @@ def get_swiftpm_flags(args):
+         build_flags.extend(["-Xcc", "-I/usr/local/include"])
+         build_flags.extend(["-Xlinker", "-L/usr/local/lib"])
+ 
+-    # Don't use GNU strerror_r on Android.
+-    if '-android' in args.build_target:
+-        build_flags.extend(["-Xswiftc", "-Xcc", "-Xswiftc", "-U_GNU_SOURCE"])
+-        build_flags.extend(["-Xlinker", "-landroid-spawn"])
++    build_flags.extend(["-Xlinker", "-landroid-spawn"])
+ 
+     cross_compile_hosts = args.cross_compile_hosts
+     if cross_compile_hosts:

swift-system.patch renamed to swift-android-ci-release.patch

@@ -1,3 +1,15 @@
+diff --git a/sourcekit-lsp/Utilities/build-script-helper.py b/sourcekit-lsp/Utilities/build-script-helper.py
+index bd31bec..4469cab 100755
+--- a/sourcekit-lsp/Utilities/build-script-helper.py
++++ b/sourcekit-lsp/Utilities/build-script-helper.py
+@@ -129,6 +129,7 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace) -> List[str]:
+         swiftpm_args += [
+             '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android',
+             # SwiftPM will otherwise try to compile against GNU strerror_r on
++            '-Xlinker', '-landroid-spawn',
+             # Android and fail.
+             '-Xswiftc', '-Xcc', '-Xswiftc', '-U_GNU_SOURCE',
+         ]
 diff --git a/swift-system/Sources/System/Internals/CInterop.swift b/swift-system/Sources/System/Internals/CInterop.swift
 index 13abc75..2ad551a 100644
 --- a/swift-system/Sources/System/Internals/CInterop.swift
@@ -64,3 +76,30 @@ index 555f63b..f0db35f 100644
  #else
  #error("Unsupported Platform")
  #endif
+diff --git a/swiftpm/Utilities/bootstrap b/swiftpm/Utilities/bootstrap
+index 085056de..1ded1a90 100755
+--- a/swiftpm/Utilities/bootstrap
++++ b/swiftpm/Utilities/bootstrap
+@@ -827,6 +827,7 @@ def get_swiftpm_flags(args):
+     # Don't use GNU strerror_r on Android.
+     if '-android' in args.build_target:
+         build_flags.extend(["-Xswiftc", "-Xcc", "-Xswiftc", "-U_GNU_SOURCE"])
++        build_flags.extend(["-Xlinker", "-landroid-spawn"])
+ 
+     cross_compile_hosts = args.cross_compile_hosts
+     if cross_compile_hosts:
+diff --git a/yams/Sources/Yams/Representer.swift b/yams/Sources/Yams/Representer.swift
+index a749c52..b74ef8e 100644
+--- a/yams/Sources/Yams/Representer.swift
++++ b/yams/Sources/Yams/Representer.swift
+@@ -14,6 +14,10 @@ private let cpow: (_: Double, _: Double) -> Double = Darwin.pow
+ #elseif os(Windows)
+ import ucrt
+ private let cpow: (_: Double, _: Double) -> Double = ucrt.pow
++#elseif canImport(Bionic)
++import CoreFoundation
++import Bionic
++private let cpow: (_: Double, _: Double) -> Double = Bionic.pow
+ #else
+ import CoreFoundation
+ import Glibc

swift-android-ci.patch

@@ -40,18 +40,6 @@ index 92a1ee38..52273afb 100644
  add_subdirectory(BuildSystem)
 -add_subdirectory(Ninja)
 +#add_subdirectory(Ninja)
-diff --git a/sourcekit-lsp/Utilities/build-script-helper.py b/sourcekit-lsp/Utilities/build-script-helper.py
-index bd31bec..4469cab 100755
---- a/sourcekit-lsp/Utilities/build-script-helper.py
-+++ b/sourcekit-lsp/Utilities/build-script-helper.py
-@@ -129,6 +129,7 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace) -> List[str]:
-         swiftpm_args += [
-             '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android',
-             # SwiftPM will otherwise try to compile against GNU strerror_r on
-+            '-Xlinker', '-landroid-spawn',
-             # Android and fail.
-             '-Xswiftc', '-Xcc', '-Xswiftc', '-U_GNU_SOURCE',
-         ]
 diff --git a/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift b/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
 index b7fa046..a94e3b8 100644
 --- a/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
@@ -96,30 +84,17 @@ diff --git a/swift-certificates/Sources/X509/Verifier/RFC5280/URIConstraints.swi
  #elseif canImport(Darwin)
  import Darwin
  #endif
-diff --git a/swiftpm/Utilities/bootstrap b/swiftpm/Utilities/bootstrap
-index 085056de..1ded1a90 100755
---- a/swiftpm/Utilities/bootstrap
-+++ b/swiftpm/Utilities/bootstrap
-@@ -827,6 +827,7 @@ def get_swiftpm_flags(args):
-     # Don't use GNU strerror_r on Android.
-     if '-android' in args.build_target:
-         build_flags.extend(["-Xswiftc", "-Xcc", "-Xswiftc", "-U_GNU_SOURCE"])
-+        build_flags.extend(["-Xlinker", "-landroid-spawn"])
- 
-     cross_compile_hosts = args.cross_compile_hosts
-     if cross_compile_hosts:
-diff --git a/yams/Sources/Yams/Representer.swift b/yams/Sources/Yams/Representer.swift
-index a749c52..b74ef8e 100644
---- a/yams/Sources/Yams/Representer.swift
-+++ b/yams/Sources/Yams/Representer.swift
-@@ -14,6 +14,10 @@ private let cpow: (_: Double, _: Double) -> Double = Darwin.pow
- #elseif os(Windows)
- import ucrt
- private let cpow: (_: Double, _: Double) -> Double = ucrt.pow
-+#elseif canImport(Bionic)
-+import CoreFoundation
-+import Bionic
-+private let cpow: (_: Double, _: Double) -> Double = Bionic.pow
+diff --git a/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift b/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
+index 5f47c2f..4b5579e 100644
+--- a/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
++++ b/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
+@@ -15,6 +15,9 @@
+ @_exported import CryptoKit
  #else
- import CoreFoundation
- import Glibc
+ import Foundation
++#if canImport(Android)
++import Android
++#endif
+ 
+ /// A standards-based implementation of an HMAC-based Key Derivation Function
+ /// (HKDF).

swift-android-testing-except-release.patch

@@ -0,0 +1,48 @@
+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
++++ b/swift-corelibs-xctest/cmake/modules/PlatformInfo.cmake
+@@ -2,6 +2,10 @@
+ set(print_target_info_invocation "${CMAKE_Swift_COMPILER}" -print-target-info)
+ if(CMAKE_Swift_COMPILER_TARGET)
+   list(APPEND print_target_info_invocation -target ${CMAKE_Swift_COMPILER_TARGET})
++else()
++  set(arg_list ${CMAKE_Swift_FLAGS})
++  separate_arguments(arg_list)
++  list(APPEND print_target_info_invocation ${arg_list})
+ endif()
+ execute_process(COMMAND ${print_target_info_invocation} OUTPUT_VARIABLE target_info_json)
+ message(CONFIGURE_LOG "Swift Target Info: ${print_target_info_invocation}\n"
+diff --git a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+index 78227e3..e0db2e9 100644
+--- a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
++++ b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+@@ -65,11 +65,11 @@ public struct Backtrace: Sendable {
+       } else {
+         initializedCount = .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+       }
+-#elseif os(Android)
++#elseif os(Androi)
+       initializedCount = addresses.withMemoryRebound(to: UnsafeMutableRawPointer.self) { addresses in
+         .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+       }
+-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD)
++#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(Android)
+       initializedCount = .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+ #elseif os(Windows)
+       initializedCount = Int(clamping: RtlCaptureStackBackTrace(0, ULONG(clamping: addresses.count), addresses.baseAddress!, nil))
+diff --git a/swift-testing/cmake/modules/PlatformInfo.cmake b/swift-testing/cmake/modules/PlatformInfo.cmake
+index 94c60ef..ab8a491 100644
+--- a/swift-testing/cmake/modules/PlatformInfo.cmake
++++ b/swift-testing/cmake/modules/PlatformInfo.cmake
+@@ -9,6 +9,10 @@
+ set(print_target_info_invocation "${CMAKE_Swift_COMPILER}" -print-target-info)
+ if(CMAKE_Swift_COMPILER_TARGET)
+   list(APPEND print_target_info_invocation -target ${CMAKE_Swift_COMPILER_TARGET})
++else()
++  set(arg_list ${CMAKE_Swift_FLAGS})
++  separate_arguments(arg_list)
++  list(APPEND print_target_info_invocation ${arg_list})
+ endif()
+ execute_process(COMMAND ${print_target_info_invocation} OUTPUT_VARIABLE target_info_json)
+ message(CONFIGURE_LOG "Swift Target Info: ${print_target_info_invocation}\n"