Skip to content

Commit edb1240

Browse files
committed
Fix ANDROID_SDK_TRIPLE
1 parent a5a207b commit edb1240

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
@@ -25,7 +25,7 @@ SWIFTPM_HOME="${XDG_CONFIG_HOME}"/swiftpm
2525
# e.g., "${SWIFTPM_HOME}"/swift-sdks/swift-DEVELOPMENT-SNAPSHOT-2025-12-11-a_android.artifactbundle/
2626
SWIFT_ANDROID_SDK_HOME=$(find "${SWIFTPM_HOME}"/swift-sdks -maxdepth 1 -name 'swift-*android.artifactbundle' | tail -n 1)
2727

28-
ANDROID_SDK_TRIPLES="x86_64-unknown-linux-android28"
28+
ANDROID_SDK_TRIPLE="x86_64-unknown-linux-android28"
2929

3030
while [[ $# -gt 0 ]]; do
3131
case $1 in
@@ -38,7 +38,7 @@ while [[ $# -gt 0 ]]; do
3838
shift
3939
;;
4040
--android-sdk-triple=*)
41-
ANDROID_SDK_TRIPLES+=("${1#*=}")
41+
ANDROID_SDK_TRIPLE="${1#*=}"
4242
shift
4343
;;
4444
-*)
@@ -56,9 +56,9 @@ while [[ $# -gt 0 ]]; do
5656
done
5757

5858
# extract the API level from the end of the triple
59-
ANDROID_API="${ANDROID_EMULATOR_ARCH_TRIPLE/*-unknown-linux-android/}"
59+
ANDROID_API="${ANDROID_SDK_TRIPLE/*-unknown-linux-android/}"
6060
# extract the build arch from the beginning of the triple
61-
ANDROID_EMULATOR_ARCH="${ANDROID_EMULATOR_ARCH_TRIPLE/-unknown-linux-android*/}"
61+
ANDROID_EMULATOR_ARCH="${ANDROID_SDK_TRIPLE/-unknown-linux-android*/}"
6262

6363
# x86_64=x86_64, armv7=arm
6464
ANDROID_EMULATOR_ARCH_TRIPLE="${ANDROID_EMULATOR_ARCH}"

0 commit comments

Comments
 (0)