From bbcb934846eb760b8f83fda1b94ac906676b3a12 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@apple.com>
Date: Sat, 25 Oct 2025 18:39:32 -0700
Subject: [PATCH 1/2] Update Android SDK build name to include NDK version

This allows differentiating them when multiple NDKs are used.

As far as multiple triples, I think those should be handled within the workflow, rather than splitting off into new matrix entries (especially as we already have some multi-triple build capabilities in swiftpm for macOS now and could conceivably extend that to Android), but that's for another PR.
---
 .github/workflows/swift_package_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml
index b80f150..e6ee92a 100644
--- a/.github/workflows/swift_package_test.yml
+++ b/.github/workflows/swift_package_test.yml
@@ -504,7 +504,7 @@ jobs:
           bash -s -- --embedded-wasm --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}
 
   android-sdk-build:
-    name: Swift SDK for Android Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
+    name: Swift SDK for Android Build (${{ matrix.swift_version }} - ${{ matrix.os_version }} - NDK ${{ matrix.ndk_version }})
     if: ${{ inputs.enable_android_sdk_build }}
     runs-on: ubuntu-latest
     strategy:

From 57b90370b62b023d7adfb9ed58508e50667e1661 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@apple.com>
Date: Sat, 25 Oct 2025 18:50:26 -0700
Subject: [PATCH 2/2] Fix variable reference in Android build script

---
 .github/workflows/swift_package_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml
index e6ee92a..4b915fe 100644
--- a/.github/workflows/swift_package_test.yml
+++ b/.github/workflows/swift_package_test.yml
@@ -560,7 +560,7 @@ jobs:
             exit 1
           fi
           curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
-          bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple="${{ inputs.sdk_triple }}" --android-ndk-version="${{ inputs.ndk_version }}" ${{ matrix.swift_version }}
+          bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple="${{ matrix.sdk_triple }}" --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
 
   windows-build:
     name: Windows (${{ matrix.swift_version }} - windows-2022)