Merge branch 'swift-android-sdk:main' into main

Author: marcprux

.github/workflows/android_sdk.yml

@@ -38,6 +38,7 @@ jobs:
           fi
 
           # Generate matrix with parsed environment variables
+          # FIXME: move script back from swift-android-sdk repo to swift-nio
           cat >> "$GITHUB_OUTPUT" << EOM
           android-sdk-matrix=$(echo '{
             "config":[
@@ -47,7 +48,7 @@ jobs:
                 "platform":"Linux",
                 "runner":"ubuntu-latest",
                 "image":"ubuntu:jammy",
-                "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=android-sdk bash && hash -r",
+                "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-android-sdk/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=android-sdk bash && hash -r",
                 "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/swift-build-with-android-sdk.sh | bash -s --",
                 "command_arguments":"${{ inputs.additional_command_arguments }}",
                 "env":'"$env_vars_json"'

scripts/install_swift_sdk.sh

@@ -131,14 +131,15 @@ swift sdk install "$sdk_path"
 if [[ "$sdk" == "android-sdk" ]]; then
     log "Swift SDK Post-install"
     # guess some common places where the swift-sdks file lives
-    cd ~/Library/org.swift.swiftpm || cd ~/.config/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm || cd /root/.swiftpm
+    cd ~/Library/org.swift.swiftpm || cd ~/.config/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm || cd /root/.swiftpm || exit 1
 
     # download and link the NDK
-    local android_ndk_version="r27d"
+    android_ndk_version="r27d"
     curl -fsSL -o ndk.zip --retry 3 "https://dl.google.com/android/repository/android-ndk-${android_ndk_version}-$(uname -s).zip"
     unzip -q ndk.zip
     rm ndk.zip
     export ANDROID_NDK_HOME="${PWD}/android-ndk-${android_ndk_version}"
-    ./swift-sdks/*android*.artifactbundle/swift-android/scripts/setup-android-sdk.sh
-    cd -
+    bundledir=$(ls -d swift-sdks/*android*.artifactbundle | head -n 1)
+    ${bundledir}/swift-android/scripts/setup-android-sdk.sh
+    cd - || exit
 fi