Use the latest execinfo.h from the NDK on the CI, both when building the SDK and then in the bundle

Simply patch the header to work with API 24 instead, which works for older Android APIs
because of the included backported libandroid-execinfo.

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}-parch-bundle" >> $GITHUB_OUTPUT
+          echo "key=$SWIFT_TAG-ndk-${NDK_VERSION}-bt-bundle" >> $GITHUB_OUTPUT
       - name: Get cached SDK bundle
         id: cache-bundle
         uses: actions/cache/restore@v4
@@ -137,7 +137,7 @@ jobs:
             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)
-            cp $SDK_NAME/usr/include/execinfo.h $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include
+            perl -pi -e 's%33%24%' $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/execinfo.h
           fi
 
           perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
@@ -159,6 +159,10 @@ jobs:
             SDK_NAME=$(ls | grep swift-${{ matrix.version }}-android-$arch)
             SDK=`pwd`/$SDK_NAME
 
+            # Patch the NDK execinfo.h to work with the backported libandroid-execinfo
+            cp $SYSROOT/usr/include/execinfo.h ${SDK_NAME}/usr/include
+            perl -pi -e 's%33%24%' ${SDK_NAME}/usr/include/execinfo.h
+
             ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_HOME --android-arch $arch --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=${TOOLCHAIN}/bin --native-clang-tools-path=${TOOLCHAIN}/bin --cross-compile-hosts=android-$arch --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b --install-llbuild --swift-testing --install-swift-testing -p $LSP_BUILD
 
             rm $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift

swift-android-testing-except-release.patch

@@ -13,24 +13,6 @@ index 468dc61..a90ae3d 100644
  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

swift-android-testing-release.patch

@@ -44,24 +44,6 @@ 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-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)
-+#elseif os(Linux) || os(FreeBSD) || 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/SwiftModuleInstallation.cmake b/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
 index 1553725..d9f9e5b 100644
 --- a/swift-testing/cmake/modules/SwiftModuleInstallation.cmake