Try testing against emulator API level 23

Author: marcprux

.github/workflows/pull_request.yml

@@ -156,6 +156,7 @@ jobs:
           echo 'import FoundationNetworking' >> Sources/DemoProject/DemoProject.swift
           echo 'import Dispatch' >> Sources/DemoProject/DemoProject.swift
           echo 'import Android' >> Sources/DemoProject/DemoProject.swift
+
       - name: Test Demo Project on Android
         uses: skiptools/swift-android-action@main
         if: ${{ matrix.runner != 'self-hosted' }}
@@ -165,6 +166,7 @@ jobs:
           package-path: ${{ runner.temp }}/DemoProject
           installed-sdk: ${{ steps.info.outputs.sdk-id }}
           installed-swift: ${{ steps.info.outputs.swift-root }}
+          android-api-level: 23
 
       - name: Checkout swift-algorithms
         if: ${{ matrix.runner != 'self-hosted' }}
@@ -179,6 +181,7 @@ jobs:
           package-path: swift-algorithms
           installed-sdk: ${{ steps.info.outputs.sdk-id }}
           installed-swift: ${{ steps.info.outputs.swift-root }}
+          android-api-level: 23
 
       - name: Checkout swift-system
         if: ${{ matrix.runner != 'self-hosted' }}
@@ -193,6 +196,7 @@ jobs:
           package-path: swift-system
           installed-sdk: ${{ steps.info.outputs.sdk-id }}
           installed-swift: ${{ steps.info.outputs.swift-root }}
+          android-api-level: 23
 
       - name: Checkout swift-collections
         if: ${{ matrix.runner != 'self-hosted' }}
@@ -207,4 +211,5 @@ jobs:
           package-path: swift-collections
           installed-sdk: ${{ steps.info.outputs.sdk-id }}
           installed-swift: ${{ steps.info.outputs.swift-root }}
+          android-api-level: 23
 

swift-ci/sdks/android/scripts/fetch-source.sh

@@ -162,25 +162,21 @@ git checkout ${BORINGSSL_VERSION}
 popd >/dev/null 2>&1
 groupend
 
-groupstart "Patchin Sources"
+groupstart "Patching Sources"
 # This `git grep` invocation in a trunk test fails in our Docker for some
 # reason, so just turn it into a plain `grep` again.
 perl -pi -e 's:"git",:#:' swift-project/swift/test/Misc/verify-swift-feature-testing.test-sh
 
 # Work around swiftlang/swift-driver#1822 for now
 perl -pi -g -we "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2if [[ -d \"\\\${ANDROID_NDK}\" ]]; then call ln -sf \"\\\${SWIFT_BUILD_PATH}/lib/swift\" \"\\\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib\"; fi#" swift-project/swift/utils/build-script-impl
 
-# disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
-perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' swift-project/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
-
 # Disable posix_spawnattr_* calls for Android API 24
 perl -pi -e 's;try _throwIfPosixError\(posix_spawnattr_init;//try _throwIfPosixError\(posix_spawnattr_init;g' swift-project/swift-corelibs-foundation/Sources/Foundation/Process.swift
 perl -pi -e 's;try _throwIfPosixError\(posix_spawnattr_setflags;//try _throwIfPosixError\(posix_spawnattr_setflags;g' swift-project/swift-corelibs-foundation/Sources/Foundation/Process.swift
 perl -pi -e 's;posix_spawnattr_destroy;//posix_spawnattr_destroy;g' swift-project/swift-corelibs-foundation/Sources/Foundation/Process.swift
 
-# fix getgrgid_r and getgrnam_r missing from Android API 23
-perl -pi -e 's;getgrgid_r;{ _, _, _, _, _ in 0 };g' swift-project/swift-foundation/Sources/FoundationEssentials/Platform.swift
-perl -pi -e 's;getgrnam_r;{ _, _, _, _, _ in 0 };g' swift-project/swift-foundation/Sources/FoundationEssentials/Platform.swift
+# Stub out getgrgid_r and getgrnam_r missing from Android API 23
+perl -pi -e 's;getgrgid_r|getgrnam_r;{ _, _, _, _, _ in 0 };g' swift-project/swift-foundation/Sources/FoundationEssentials/Platform.swift
 
 groupend