Skip to content

Commit fb98750

Browse files
committed
Change default Android SDK build command
Updated default build command for Android SDK to use 'swift build' instead of 'swift build --build-system native'. The 4/27 snapshot contains the requisite changes for Android to work. For Wasm, we want to wait until swiftlang/swift-build#1348 lands before unpinning.
1 parent 3280fe0 commit fb98750

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/scripts/android/android-emulator-tests.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,10 @@ STAGING_DIR="swift-android-test"
122122
rm -rf "${STAGING_DIR}"
123123
mkdir "${STAGING_DIR}"
124124

125-
BUILD_DIR=.build/"${ANDROID_SDK_TRIPLE}"/debug
125+
swift build --version
126+
which swift
127+
swift --version
128+
BUILD_DIR=$(swift build --show-bin-path --triple "${ANDROID_SDK_TRIPLE}")
126129

127130
find "${BUILD_DIR}" -name '*.xctest' -exec cp -av {} "${STAGING_DIR}" \;
128131
find "${BUILD_DIR}" -name '*.resources' -exec cp -av {} "${STAGING_DIR}" \;

.github/workflows/swift_package_test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ on:
171171
android_sdk_build_command:
172172
type: string
173173
description: "Command to use when building the package with the Swift SDK for Android"
174-
# Temporarily use native build system on Android due to https://github.com/swiftlang/swift/issues/88282
175-
default: "swift build --build-system native"
174+
default: "swift build"
176175
android_sdk_triples:
177176
type: string
178177
description: "The triples to use when building with the Swift SDK for Android. The final triple in the list will be used for the emulator testing and should match the host architecture."

0 commit comments

Comments
 (0)