From 85275440830cdc73666cf38b66056d12b5a2e69d Mon Sep 17 00:00:00 2001
From: Justice Adams <107649528+justice-adams-apple@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:47:48 -0800
Subject: [PATCH 1/2] Remove swift SDK for android suffix

---
 .github/workflows/scripts/install-and-build-with-sdk.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/scripts/install-and-build-with-sdk.sh b/.github/workflows/scripts/install-and-build-with-sdk.sh
index e866ca1..023e530 100755
--- a/.github/workflows/scripts/install-and-build-with-sdk.sh
+++ b/.github/workflows/scripts/install-and-build-with-sdk.sh
@@ -240,8 +240,6 @@ find_latest_sdk_snapshot() {
 SWIFT_VERSION_BRANCH=""
 ANDROID_SDK_TAG=""
 ANDROID_SDK_CHECKSUM=""
-# TODO: we will be removing the "-0.1" suffix in a future nightly 
-ANDROID_SDK_PATH_SUFFIX="-0.1"
 ANDROID_SDK_PATH_SEP="-"
 
 STATIC_LINUX_SDK_TAG=""
@@ -553,7 +551,7 @@ install_android_sdk() {
 
     log "Installing Android Swift SDK: $ANDROID_SDK_TAG"
 
-    local android_sdk_name="${ANDROID_SDK_TAG}_android${ANDROID_SDK_PATH_SUFFIX}"
+    local android_sdk_name="${ANDROID_SDK_TAG}_android"
     local android_sdk_bundle_name="${android_sdk_name}.artifactbundle"
     # TODO: remove once the next nightly changes the "-" to "_" in the name 
     local android_sdk_bundle_dir="${android_sdk_bundle_name//_android/${ANDROID_SDK_PATH_SEP}android}"
@@ -664,7 +662,7 @@ build() {
     if [[ "$INSTALL_ANDROID" == true ]]; then
         log "Running Swift build with Android Swift SDK"
 
-        local sdk_name="${ANDROID_SDK_TAG}${ANDROID_SDK_PATH_SEP}android${ANDROID_SDK_PATH_SUFFIX}"
+        local sdk_name="${ANDROID_SDK_TAG}${ANDROID_SDK_PATH_SEP}android"
 
         alias swift='$SWIFT_EXECUTABLE_FOR_ANDROID_SDK'
 

From f84c379a5f51aadc93a5fa1670ad4383a25500e1 Mon Sep 17 00:00:00 2001
From: Justice Adams <107649528+justice-adams-apple@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:59:51 -0800
Subject: [PATCH 2/2] remove android_sdk_bundle_dir

---
 .github/workflows/scripts/install-and-build-with-sdk.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/scripts/install-and-build-with-sdk.sh b/.github/workflows/scripts/install-and-build-with-sdk.sh
index 023e530..63b1dc0 100755
--- a/.github/workflows/scripts/install-and-build-with-sdk.sh
+++ b/.github/workflows/scripts/install-and-build-with-sdk.sh
@@ -553,8 +553,6 @@ install_android_sdk() {
 
     local android_sdk_name="${ANDROID_SDK_TAG}_android"
     local android_sdk_bundle_name="${android_sdk_name}.artifactbundle"
-    # TODO: remove once the next nightly changes the "-" to "_" in the name 
-    local android_sdk_bundle_dir="${android_sdk_bundle_name//_android/${ANDROID_SDK_PATH_SEP}android}"
     local android_sdk_filename="${android_sdk_bundle_name}.tar.gz"
     local sdk_url="${ANDROID_SDK_DOWNLOAD_ROOT}/${ANDROID_SDK_TAG}/${android_sdk_filename}"
 
@@ -588,7 +586,7 @@ install_android_sdk() {
         export ANDROID_NDK_HOME="${PWD}"/android-ndk-"${android_ndk_version}"
     fi
 
-    ./swift-sdks/"${android_sdk_bundle_dir}"/swift-android/scripts/setup-android-sdk.sh
+    ./swift-sdks/"${android_sdk_bundle_name}"/swift-android/scripts/setup-android-sdk.sh
     cd -
 }