Skip to content

Commit 21c5b03

Browse files
committed
Reduce Android API from 24 to 23
1 parent 19adc6b commit 21c5b03

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

.github/workflows/pull_request.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
9595
ARTIFACT_PATH=$(realpath ${WORKDIR}/products/*.artifactbundle.tar.gz)
9696
echo "artifact-path=${ARTIFACT_PATH}" >> $GITHUB_OUTPUT
97-
echo "sdk-id=x86_64-unknown-linux-android28" >> $GITHUB_OUTPUT
97+
echo "sdk-id=x86_64-unknown-linux-android23" >> $GITHUB_OUTPUT
9898
9999
ARTIFACT_EXT=".artifactbundle.tar.gz"
100100
ARTIFACT_NAME="$(basename ${ARTIFACT_PATH} ${ARTIFACT_EXT})"
@@ -179,3 +179,18 @@ jobs:
179179
package-path: swift-algorithms
180180
installed-sdk: ${{ steps.info.outputs.sdk-id }}
181181
installed-swift: ${{ steps.info.outputs.swift-root }}
182+
183+
- name: Checkout swift-system
184+
if: ${{ matrix.runner != 'self-hosted' }}
185+
uses: actions/checkout@v4
186+
with:
187+
repository: apple/swift-system
188+
path: swift-system
189+
- name: Test swift-system
190+
if: ${{ matrix.runner != 'self-hosted' }}
191+
uses: skiptools/swift-android-action@main
192+
with:
193+
package-path: swift-system
194+
installed-sdk: ${{ steps.info.outputs.sdk-id }}
195+
installed-swift: ${{ steps.info.outputs.swift-root }}
196+

swift-ci/sdks/android/build-docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
1919

2020
ANDROID_NDK_VERSION=android-ndk-r27d
21-
ANDROID_API=24
21+
ANDROID_API=23
2222

2323
BASEPATH=$(dirname $(realpath $0))
2424
cd ${BASEPATH}

swift-ci/sdks/android/build-local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
1919

2020
ANDROID_NDK_VERSION=android-ndk-r27d
21-
ANDROID_API=24
21+
ANDROID_API=23
2222

2323
BASEPATH=$(dirname $(realpath $0))
2424
cd ${BASEPATH}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ declare_package boringssl "boringssl" "OpenSSL AND ISC AND MIT" \
128128
android_sdk_version=0.1
129129
sdk_name=
130130
archs=aarch64,armv7,x86_64
131-
android_api=24
131+
android_api=23
132132
build_type=Release
133133
parallel_jobs=$(($(nproc --all) + 2))
134134
source_dir=

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ perl -pi -g -we "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2i
173173
# disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
174174
perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' swift-project/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
175175

176-
# Disable posix_spawnattr_* calls for Android API 24
176+
# Disable posix_spawnattr_* calls for Android API 23
177177
perl -pi -e 's;try _throwIfPosixError\(posix_spawnattr_init;//try _throwIfPosixError\(posix_spawnattr_init;g' swift-project/swift-corelibs-foundation/Sources/Foundation/Process.swift
178178
perl -pi -e 's;try _throwIfPosixError\(posix_spawnattr_setflags;//try _throwIfPosixError\(posix_spawnattr_setflags;g' swift-project/swift-corelibs-foundation/Sources/Foundation/Process.swift
179179
perl -pi -e 's;posix_spawnattr_destroy;//posix_spawnattr_destroy;g' swift-project/swift-corelibs-foundation/Sources/Foundation/Process.swift

0 commit comments

Comments
 (0)