Skip to content

Commit f84c379

Browse files
remove android_sdk_bundle_dir
1 parent 8527544 commit f84c379

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

.github/workflows/scripts/install-and-build-with-sdk.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,6 @@ install_android_sdk() {
553553

554554
local android_sdk_name="${ANDROID_SDK_TAG}_android"
555555
local android_sdk_bundle_name="${android_sdk_name}.artifactbundle"
556-
# TODO: remove once the next nightly changes the "-" to "_" in the name
557-
local android_sdk_bundle_dir="${android_sdk_bundle_name//_android/${ANDROID_SDK_PATH_SEP}android}"
558556
local android_sdk_filename="${android_sdk_bundle_name}.tar.gz"
559557
local sdk_url="${ANDROID_SDK_DOWNLOAD_ROOT}/${ANDROID_SDK_TAG}/${android_sdk_filename}"
560558

@@ -588,7 +586,7 @@ install_android_sdk() {
588586
export ANDROID_NDK_HOME="${PWD}"/android-ndk-"${android_ndk_version}"
589587
fi
590588

591-
./swift-sdks/"${android_sdk_bundle_dir}"/swift-android/scripts/setup-android-sdk.sh
589+
./swift-sdks/"${android_sdk_bundle_name}"/swift-android/scripts/setup-android-sdk.sh
592590
cd -
593591
}
594592

0 commit comments

Comments
 (0)