Enable specifying --android-ndk-version flag

Author: marcprux

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

@@ -32,6 +32,10 @@ while [[ $# -gt 0 ]]; do
             INSTALL_ANDROID=true
             shift
             ;;
+        --android-ndk-version=*)
+            ANDROID_NDK_VERSION="${1#*=}"
+            shift
+            ;;
         --android-sdk-triple=*)
             ANDROID_SDK_TRIPLE="${1#*=}"
             shift
@@ -575,9 +579,13 @@ install_android_sdk() {
     # guess some common places where the swift-sdks file lives
     cd ~/Library/org.swift.swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm || cd /root/.swiftpm
 
+    # Download and install the Android NDK.
+    # Note that we could use the system package manager, but it is
+    # named different things for different distributions
+    # (e.g., "google-android-ndk-r26-installer" on Debian)
     if [[ ! -d "${ANDROID_NDK_HOME:-}" ]]; then
-        # download and install the Android NDK
-        local android_ndk_version=r27d
+        # permit the "--android-ndk" flag to override the default
+        local android_ndk_version="${ANDROID_NDK_VERSION:-r27d}"
         curl --retry 3 -fsSLO https://dl.google.com/android/repository/android-ndk-"${android_ndk_version}"-"$(uname -s)".zip
         unzip -q android-ndk-"${android_ndk_version}"-*.zip
         export ANDROID_NDK_HOME="${PWD}"/android-ndk-"${android_ndk_version}"

.github/workflows/swift_package_test.yml

@@ -119,6 +119,10 @@ on:
         type: string
         description: "The triple to use when building with the Swift SDK for Android"
         default: "x86_64-unknown-linux-android28"
+      android_ndk_version:
+        type: string
+        description: "The NDK version to use when building with the Swift SDK for Android"
+        default: "r27d"
       windows_pre_build_command:
         type: string
         description: "Windows Command Prompt command to execute before building the Swift package"
@@ -489,7 +493,7 @@ jobs:
           # FIXME: restore to main when this PR is ready to be merged
           #curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
           curl -s --retry 3 https://raw.githubusercontent.com/swift-android-sdk/github-workflows/refs/heads/android-workflow/.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.android_sdk_triple }}" ${{ matrix.swift_version }}
+          bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple="${{ inputs.android_sdk_triple }}" --android-ndk-version="${{ inputs.android_ndk_version }}" ${{ matrix.swift_version }}
 
   windows-build:
     name: Windows (${{ matrix.swift_version }} - windows-2022)