Fix ANDROID_NDK_ROOT envrionment to work around swiftlang/swift-driver#1879

Author: marcprux

README.md

@@ -1,7 +1,7 @@
 # Swift Android native cross-compiler and test runner action
 
 This GitHub action will build and run Swift package tests on an Android emulator.
-This uses the [swift-android-toolchain](https://github.com/skiptools/swift-android-toolchain)
+This uses the [swift-android-toolchain](https://github.com/swift-android-sdk/swift-android-toolchain)
 project to provide a cross-compiler for building
 Swift natively for Android on a Linux or macOS host.
 
@@ -41,7 +41,7 @@ jobs:
       - name: "Test Swift Package on Linux"
         run: swift test
       - name: "Test Swift Package on Android"
-        uses: skiptools/swift-android-action@v2
+        uses: swift-android-sdk/swift-android-action@v2
 ```
 
 
@@ -58,15 +58,15 @@ jobs:
       - name: "Test Swift Package on Linux"
         run: swift test
       - name: "Test Swift Package on Android"
-        uses: skiptools/swift-android-action@v2
+        uses: swift-android-sdk/swift-android-action@v2
         with:
           swift-version: 6.1
 ```
 
 ### Swift Versions
 
 The `swift-version` input can be set to a specific version number (e.g., "6.0.3" or "6.1.1").
-A shortened version like "6.0" or "6.1" will use the latest [release](https://github.com/skiptools/swift-android-toolchain/releases),
+A shortened version like "6.0" or "6.1" will use the latest [release](https://github.com/swift-android-sdk/swift-android-toolchain/releases),
 which may be a pre-release build.
 
 > [!NOTE]
@@ -120,7 +120,7 @@ jobs:
       - name: "Test Swift Package on macOS"
         run: swift test
       - name: "Build Swift Package on Android"
-        uses: skiptools/swift-android-action@v2
+        uses: swift-android-sdk/swift-android-action@v2
         with:
           run-tests: false
 ```
@@ -148,7 +148,7 @@ For example:
 
 ```yml
   - name: Test Android Package
-    uses: skiptools/swift-android-action@v2
+    uses: swift-android-sdk/swift-android-action@v2
     with:
       copy-files: Tests
       test-env: TEST_WORKSPACE=1
@@ -170,7 +170,7 @@ For example:
 ```yml
   - name: Setup Toolchain
     id: setup-toolchain
-    uses: skiptools/swift-android-action@v2
+    uses: swift-android-sdk/swift-android-action@v2
     with:
       # just set up the toolchain but don't build anything
       build-package: false
@@ -221,7 +221,7 @@ jobs:
       - name: "Test Swift Package on Linux"
         run: swift test
       - name: "Test Swift Package on Android"
-        uses: skiptools/swift-android-action@v2
+        uses: swift-android-sdk/swift-android-action@v2
   macos-ios:
     runs-on: macos-latest
     steps:
@@ -245,7 +245,7 @@ jobs:
 ```
 
 For an example of this workflow in action, see a run history
-for the [swift-sqlite](https://github.com/skiptools/swift-sqlite/actions) package.
+for the [swift-sqlite](https://github.com/swift-android-sdk/swift-sqlite/actions) package.
 
 ## Development
 

action.yml

@@ -225,11 +225,7 @@ runs:
         echo "swift-branch=${SWIFT_BRANCH}" >> $GITHUB_OUTPUT
 
         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
+        if [[ "${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
@@ -382,6 +378,10 @@ runs:
         echo "swiftcmd=TARGET_OS_ANDROID=1 SKIP_BRIDGE=1 ${SWIFT_INSTALLATION}/bin/swift build --swift-sdk ${SWIFT_SDK_TARGET} -Xswiftc -plugin-path -Xswiftc ${SWIFT_INSTALLATION}/lib/swift/host/plugins/testing -Xswiftc -DTARGET_OS_ANDROID -Xswiftc -DSKIP_BRIDGE ${{ inputs.swift-build-flags }}" >> $GITHUB_OUTPUT
         echo "swift-sdk=${SWIFT_SDK_TARGET}" >> $GITHUB_OUTPUT
 
+        if [[ ${SWIFT_VERSION_ID} != swift-6.0* ]]; then
+          # see https://github.com/finagolfin/swift-android-sdk/issues/207
+          echo "ANDROID_NDK_ROOT=" >> $GITHUB_ENV
+        fi
     - name: Check Swift Version
       shell: bash
       run: |