Get latest trunk tag again on CI and remove upstreamed patch

Author: finagolfin

.github/workflows/sdks.yml

@@ -28,8 +28,7 @@ jobs:
             SWIFT_TAG="swift-6.2-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
           else
             LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-DEV | cut -d- -f7-9)
-            SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-2025-06-22-a"
-            # ${LATEST_TOOLCHAIN_VERSION}-a"
+            SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
           fi
           echo "tag=$SWIFT_TAG" >> $GITHUB_OUTPUT
           echo "key=$SWIFT_TAG-ndk-${NDK_VERSION}-get-bundle" >> $GITHUB_OUTPUT

swift-android-testing-release.patch

@@ -1,3 +1,17 @@
+diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
+index 16e05052609..7ab8cebfab8 100755
+--- a/swift/utils/build-script-impl
++++ b/swift/utils/build-script-impl
+@@ -828,6 +828,9 @@ function set_build_options_for_host() {
+     # and it must be the same for both LLVM and Swift
+
+     if [[ "${SWIFT_HOST_TRIPLE}" ]] ; then
++        SWIFT_TARGET_CMAKE_OPTIONS+=(
++            -DCMAKE_Swift_COMPILER_TARGET:STRING="${SWIFT_HOST_TRIPLE}"
++        )
+         llvm_cmake_options+=(
+             -DLLVM_HOST_TRIPLE:STRING="${SWIFT_HOST_TRIPLE}"
+         )
 diff --git a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
 index b6bfa5760ef..324d1a77eea 100644
 --- a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py

swift-android.patch

@@ -2,16 +2,6 @@ diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
 index 16e05052609..7ab8cebfab8 100755
 --- a/swift/utils/build-script-impl
 +++ b/swift/utils/build-script-impl
-@@ -828,6 +828,9 @@ function set_build_options_for_host() {
-     # and it must be the same for both LLVM and Swift
- 
-     if [[ "${SWIFT_HOST_TRIPLE}" ]] ; then
-+        SWIFT_TARGET_CMAKE_OPTIONS+=(
-+            -DCMAKE_Swift_COMPILER_TARGET:STRING="${SWIFT_HOST_TRIPLE}"
-+        )
-         llvm_cmake_options+=(
-             -DLLVM_HOST_TRIPLE:STRING="${SWIFT_HOST_TRIPLE}"
-         )
 @@ -2622,6 +2622,7 @@ for host in "${ALL_HOSTS[@]}"; do
                      echo "Cleaning the libdispatch build directory"
                      call rm -rf "${LIBDISPATCH_BUILD_DIR}"