Reduce Android API from 24 to 23

Author: marcprux

.github/workflows/pull_request.yml

@@ -94,7 +94,7 @@ jobs:
 
           ARTIFACT_PATH=$(realpath ${WORKDIR}/products/*.artifactbundle.tar.gz)
           echo "artifact-path=${ARTIFACT_PATH}" >> $GITHUB_OUTPUT
-          echo "sdk-id=x86_64-unknown-linux-android24" >> $GITHUB_OUTPUT
+          echo "sdk-id=x86_64-unknown-linux-android23" >> $GITHUB_OUTPUT
 
           ARTIFACT_EXT=".artifactbundle.tar.gz"
           ARTIFACT_NAME="$(basename ${ARTIFACT_PATH} ${ARTIFACT_EXT})"
@@ -194,17 +194,17 @@ jobs:
           installed-sdk: ${{ steps.info.outputs.sdk-id }}
           installed-swift: ${{ steps.info.outputs.swift-root }}
 
-      - name: Checkout swift-nio
+      - name: Checkout swift-crypto
         if: ${{ matrix.runner != 'self-hosted' }}
         uses: actions/checkout@v4
         with:
-          repository: apple/swift-nio
-          path: swift-nio
-      - name: Test swift-nio
+          repository: apple/swift-crypto
+          path: swift-crypto
+      - name: Test swift-crypto
         if: ${{ matrix.runner != 'self-hosted' }}
         uses: skiptools/swift-android-action@main
         with:
-          package-path: swift-nio
+          package-path: swift-crypto
           installed-sdk: ${{ steps.info.outputs.sdk-id }}
           installed-swift: ${{ steps.info.outputs.swift-root }}
 

swift-ci/sdks/android/build-docker

@@ -18,7 +18,6 @@
 TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 
 ANDROID_NDK_VERSION=android-ndk-r27d
-ANDROID_API=24
 
 BASEPATH=$(dirname $(realpath $0))
 cd ${BASEPATH}
@@ -60,6 +59,5 @@ $DOCKER run -i --rm \
             --products-dir "/products" \
             --host-toolchain "/usr/local/swift" \
             --build-compiler "${BUILD_COMPILER}" \
-            --android-api "${ANDROID_API}" \
             --ndk-home "/usr/local/ndk/${ANDROID_NDK_VERSION}" \
             --archs "${TARGET_ARCHS}"

swift-ci/sdks/android/build-local

@@ -18,7 +18,6 @@
 TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 
 ANDROID_NDK_VERSION=android-ndk-r27d
-ANDROID_API=24
 
 BASEPATH=$(dirname $(realpath $0))
 cd ${BASEPATH}
@@ -70,6 +69,5 @@ mkdir -p ${WORKDIR}/products
     --build-dir "${WORKDIR}/build" \
     --build-compiler "${BUILD_COMPILER}" \
     --host-toolchain "${HOST_TOOLCHAIN}" \
-    --android-api "${ANDROID_API}" \
     --ndk-home "${ANDROID_NDK_HOME}" \
     --archs "${TARGET_ARCHS}"

swift-ci/sdks/android/scripts/build.sh

@@ -128,7 +128,7 @@ declare_package boringssl "boringssl" "OpenSSL AND ISC AND MIT" \
 android_sdk_version=0.1
 sdk_name=
 archs=aarch64,armv7,x86_64
-android_api=24
+android_api=23
 build_type=Release
 parallel_jobs=$(($(nproc --all) + 2))
 source_dir=

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

@@ -178,5 +178,9 @@ perl -pi -e 's;try _throwIfPosixError\(posix_spawnattr_init;//try _throwIfPosixE
 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
+
 groupend