Add ndk-version input parameter

Author: marcprux

.github/workflows/test-action.yml

@@ -13,6 +13,7 @@ jobs:
         os: ['ubuntu-24.04', 'ubuntu-22.04', 'macos-13', 'macos-15']
         #swift-version: ['6.0', '6.1']
         swift-version: ['6.0', '6.1', '6.1.1', 'nightly-6.2']
+        ndk-version: ['27', '28']
     steps:
       - name: Checkout Action
         uses: actions/checkout@v4
@@ -34,6 +35,7 @@ jobs:
         with:
           package-path: jpsim/Yams
           swift-version: ${{ matrix.swift-version }}
+          ndk-version: ${{ matrix.ndk-version }}
           run-tests: ${{ matrix.os != 'macos-15' }} # no tests on macOS ARM
           copy-files: Tests
           test-env: TEST_WORKSPACE=1
@@ -48,6 +50,7 @@ jobs:
         with:
           package-path: skiptools/swift-android-native
           swift-version: ${{ matrix.swift-version }}
+          ndk-version: ${{ matrix.ndk-version }}
           run-tests: ${{ matrix.os != 'macos-15' }} # no tests on macOS ARM
 
   toolchain-setup:
@@ -57,15 +60,12 @@ jobs:
       matrix:
         os: ['ubuntu-24.04', 'ubuntu-22.04', 'macos-13', 'macos-15']
         swift-version: ['6.0', '6.1', 'nightly-6.2']
+        ndk-version: ['27', '28']
     steps:
       - name: Checkout Action
         uses: actions/checkout@v4
         with:
           path: swift-android-action
-      - name: Setup NDK
-        if: ${{ matrix.os == 'macos-13' }} # macOS-13 defaults to NDK 16, NDK 17+ needed
-        run: |
-            echo "ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/27.2.12479018" >> $GITHUB_ENV
       - name: Setup Toolchain
         id: setup-toolchain
         uses: ./swift-android-action/
@@ -74,6 +74,7 @@ jobs:
           # just set up the toolchain and don't build anything
           build-package: false
           swift-version: ${{ matrix.swift-version }}
+          ndk-version: ${{ matrix.ndk-version }}
       - name: Checkout apple/swift-numerics
         uses: actions/checkout@v4
         with:

README.md

@@ -84,6 +84,7 @@ or the most recent snapshot/nightly build can be specified with `nightly-6.2`.
 | Parameter | Description | Default  |
 |-----|-----|-----|
 | swift-version | The version of the Swift toolchain to use | 6.1 |
+| ndk-version | The version of the Android NDK to use | <default> |
 | package-path | The folder where the swift package is checked out | . |
 | swift-configuration | Whether to build with debug or release configuration | debug |
 | swift-build-flags | Additional flags to pass to the swift build command |  |

action.yml

@@ -18,6 +18,11 @@ inputs:
     description: 'The version of the Swift toolchain to use'
     required: true
     default: 'latest'
+  ndk-version:
+    description: 'The version of the NDK to use for 6.2+'
+    required: false
+    type: string
+    default: ''
   swift-branch:
     description: 'The branch of the Swift toolchain to use'
     required: true
@@ -219,10 +224,15 @@ runs:
         echo "SWIFT_BRANCH: ${SWIFT_BRANCH}"
         echo "swift-branch=${SWIFT_BRANCH}" >> $GITHUB_OUTPUT
 
-        if [[ ${SWIFT_VERSION_ID} != swift-6.0* ]]; then
-          # recent releases require that ANDROID_NDK_ROOT *not* be set 
+        NDK_VERSION="${{ inputs.ndk-version }}"
+        if [[ ${SWIFT_VERSION_ID} == swift-6.1* ]]; then
+          # 6.1 releases require that ANDROID_NDK_ROOT *not* be set 
           # see https://github.com/finagolfin/swift-android-sdk/issues/207
           echo "ANDROID_NDK_ROOT=" >> $GITHUB_ENV
+        elif [[ "${NDK_VERSION}" != '' ]]; then
+          # we can set ndk-version to "27" or "27.0" or "27.2.12479018"
+          NDK_BASE=$(dirname "${ANDROID_NDK_ROOT}")
+          echo "ANDROID_NDK_ROOT=$(ls -rd ${NDK_BASE}/${NDK_VERSION}* | head -n 1)" >> $GITHUB_ENV
         fi
 
     - name: Cache Swift ${{ steps.setup.outputs.swift-version }} Host Toolchain