Android SDK build

Author: marcprux

.github/workflows/pull_request.yml

@@ -87,20 +87,20 @@ jobs:
           echo 'import Concurrency' >> Sources/DemoProject/DemoProject.swift
           echo 'import Dispatch' >> Sources/DemoProject/DemoProject.swift
           echo 'import Android' >> Sources/DemoProject/DemoProject.swift
-          #${{ steps.paths.outputs.swift-path }} build --build-tests --swift-sdk x86_64-unknown-linux-android
-          ${{ steps.paths.outputs.swift-path }} build --swift-sdk x86_64-unknown-linux-android
+          #${{ steps.paths.outputs.swift-path }} build --build-tests --swift-sdk x86_64-linux-android28
+          ${{ steps.paths.outputs.swift-path }} build --swift-sdk x86_64-linux-android28
       - name: Build swift-algorithms
         run: |
           cd ${{ runner.temp }}
           git clone https://github.com/apple/swift-algorithms.git
           cd swift-algorithms
-          ${{ steps.paths.outputs.swift-path }} build --build-tests --swift-sdk x86_64-unknown-linux-android
+          ${{ steps.paths.outputs.swift-path }} build --build-tests --swift-sdk x86_64-linux-android28
       - name: Test Swift Package on Android
         # TODO: need to implement installed-sdk option in swift-android-action
         if: false
         uses: skiptools/swift-android-action@main
         with:
           package-path: ${{ runner.temp }}/DemoProject
-          installed-sdk: x86_64-unknown-linux-android
+          installed-sdk: x86_64-linux-android28
           installed-swift: ${{ steps.paths.outputs.swift-path }}
 

swift-ci/sdks/android/scripts/build.sh

@@ -402,7 +402,7 @@ groupstart "Bundling SDK"
 sdk_name=swift-${swift_version}-android-${android_api}-${android_sdk_version}
 #sdk_base=android-27c-sysroot
 #sdk_base=swift-unknown-android
-sdk_base=unknown-linux-android
+sdk_base=linux-android
 #sdk_root="${sdk_base}-${android_sdk_version}.sdk"
 sdk_root="${sdk_base}.sdk"
 
@@ -434,7 +434,7 @@ EOF
 
 cd "$sdk_name/$sdk_base"
 
-cp -a ${ndk_toolchain}/sysroot sysroot
+cp -a ${ndk_toolchain}/sysroot ndk-sysroot
 
 cat > swift-sdk.json <<EOF
 {
@@ -443,22 +443,23 @@ cat > swift-sdk.json <<EOF
 EOF
 
 first=true
-for arch in $archs; do
-    if [[ "$first" == "true" ]]; then
-        first=false
-    else
-        cat >> swift-sdk.json <<EOF
+for api in $(eval echo "{$android_api..35}"); do
+    for arch in $archs; do
+        if [[ "$first" == "true" ]]; then
+            first=false
+        else
+            cat >> swift-sdk.json <<EOF
     },
 EOF
-    fi
-    cat >> swift-sdk.json <<EOF
-    "${arch}-${sdk_base}": {
-      "sdkRootPath": "sysroot",
-      "sdkRootPathXXX": "${sdk_root}/${arch}",
+        fi
+        cat >> swift-sdk.json <<EOF
+    "${arch}-${sdk_base}${api}": {
+      "sdkRootPath": "ndk-sysroot",
       "swiftResourcesPath": "${sdk_root}/${arch}/usr/lib/swift",
       "swiftStaticResourcesPath": "${sdk_root}/${arch}/usr/lib/swift_static",
       "toolsetPaths": [ "swift-toolset.json" ]
 EOF
+    done
 done
 
 cat >> swift-sdk.json <<EOF