Skip to content

Commit 707adbd

Browse files
committed
Fix location of Swift SDK for Android
1 parent 4f6703e commit 707adbd

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ ANDROID_PROFILE="Nexus 10"
2727
ANDROID_EMULATOR_LAUNCH_TIMEOUT=300
2828

2929
export SWIFTPM_HOME=/root/.swiftpm
30-
# e.g., /root/.swiftpm/swift-sdks/swift-DEVELOPMENT-SNAPSHOT-2025-12-11-a_android.artifactbundle/
31-
export SWIFT_ANDROID_SDK_HOME=(ls -1 "${SWIFTPM_HOME}"/swift-sdks/swift-*android.artifactbundle | tail -n 1)
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=$(ls -1 "${SWIFTPM_HOME}"/swift-sdks/swift-*android.artifactbundle | tail -n 1)
3232
export ANDROID_NDK_HOME="${SWIFTPM_HOME}"/android-ndk-r27d
3333

3434
install_package() {
@@ -104,7 +104,7 @@ sdkmanager --install "${EMULATOR_SPEC}" "emulator" "platform-tools" "platforms;a
104104

105105
log "Creating Android emulator"
106106
avdmanager create avd -n "${EMULATOR_NAME}" -k "${EMULATOR_SPEC}" --device "${ANDROID_PROFILE}"
107-
ANDROID_AVD_CONFIG="${ANDROID_AVD_HOME}"/"${EMULATOR_NAME}".avd/config.ini
107+
#ANDROID_AVD_CONFIG="${ANDROID_AVD_HOME}"/"${EMULATOR_NAME}".avd/config.ini
108108
#mkdir -p "$(dirname ${ANDROID_AVD_CONFIG})"
109109
# ~2G partition size
110110
#echo 'disk.dataPartition.size=2000000000' >> "${ANDROID_AVD_CONFIG}"
@@ -158,7 +158,7 @@ if [[ -d Tests ]]; then
158158
fi
159159

160160
cd .build/
161-
TEST_PACKAGE=$(ls -1 debug/*.xctest | tail -n 1 | xargs basename)
161+
TEST_PACKAGE=$(find debug/ -name '*.xctest' | tail -n 1 | xargs basename)
162162
cp -a debug/"${TEST_PACKAGE}" "${STAGING}"
163163
find debug/ -name '*.resources' -exec cp -a {} "${STAGING}" \;
164164
cp -a "${SWIFT_ANDROID_SDK_HOME}"/swift-android/swift-resources/usr/lib/swift-"${ANDROID_EMULATOR_ARCH_TRIPLE}"/android/*.so "${STAGING}"

0 commit comments

Comments
 (0)