Skip to content

Commit 7d58ee6

Browse files
committed
Fix location of Swift SDK for Android
1 parent 6563fe6 commit 7d58ee6

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ EMULATOR_NAME="swiftemu"
2626
ANDROID_PROFILE="Nexus 10"
2727
ANDROID_EMULATOR_LAUNCH_TIMEOUT=300
2828

29-
export SWIFTPM_HOME=/root/.swiftpm
30-
#export SWIFT_ANDROID_SDK_HOME="${SWIFTPM_HOME}"/swift-sdks/swift-DEVELOPMENT-SNAPSHOT-2025-12-11-a_android.artifactbundle/
31-
export SWIFT_ANDROID_SDK_HOME=$(find "${SWIFTPM_HOME}"/swift-sdks -maxdepth 1 -name 'swift-*android.artifactbundle' | tail -n 1)
32-
export ANDROID_NDK_HOME="${SWIFTPM_HOME}"/android-ndk-r27d
29+
SWIFTPM_HOME=/root/.swiftpm
30+
# e.g., "${SWIFTPM_HOME}"/swift-sdks/swift-DEVELOPMENT-SNAPSHOT-2025-12-11-a_android.artifactbundle/
31+
SWIFT_ANDROID_SDK_HOME=$(find "${SWIFTPM_HOME}"/swift-sdks -maxdepth 1 -name 'swift-*android.artifactbundle' | tail -n 1)
32+
ANDROID_NDK_HOME="${SWIFTPM_HOME}"/android-ndk-r27d
3333

3434
log "SWIFT_ANDROID_SDK_HOME=${SWIFT_ANDROID_SDK_HOME}"
3535
log "ANDROID_NDK_HOME=${ANDROID_NDK_HOME}"
@@ -163,7 +163,7 @@ cp -a "${ANDROID_NDK_HOME}"/toolchains/llvm/prebuilt/*/sysroot/usr/lib/"${ANDROI
163163

164164
log "Copy Swift test package to emulator"
165165

166-
ANDROID_TMP_FOLDER="/data/local/tmp"
166+
ANDROID_TMP_FOLDER="/data/local/tmp/${STAGING_DIR}"
167167
adb push "${STAGING_DIR}" "${ANDROID_TMP_FOLDER}"
168168

169169
cd -

0 commit comments

Comments
 (0)