Android SDK build

Author: marcprux

.github/workflows/pull_request.yml

@@ -80,27 +80,26 @@ jobs:
           cd DemoProject
           ${{ steps.paths.outputs.swift-path }} --version
           ${{ steps.paths.outputs.swift-path }} package init
-          echo 'import Foundation' >> Sources/DemoProject/DemoProject.swift
-          echo 'import FoundationEssentials' >> Sources/DemoProject/DemoProject.swift
-          echo 'import FoundationXML' >> Sources/DemoProject/DemoProject.swift
-          echo 'import FoundationNetworking' >> Sources/DemoProject/DemoProject.swift
-          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-linux-android28
-          ${{ steps.paths.outputs.swift-path }} build --swift-sdk x86_64-linux-android28
+          #echo 'import Foundation' >> Sources/DemoProject/DemoProject.swift
+          #echo 'import FoundationEssentials' >> Sources/DemoProject/DemoProject.swift
+          #echo 'import FoundationXML' >> Sources/DemoProject/DemoProject.swift
+          #echo 'import FoundationNetworking' >> 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-android28
+          ${{ steps.paths.outputs.swift-path }} build --swift-sdk x86_64-unknown-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-linux-android28
+          ${{ steps.paths.outputs.swift-path }} build --build-tests --swift-sdk x86_64-unknown-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-linux-android28
+          installed-sdk: x86_64-unknown-linux-android28
           installed-swift: ${{ steps.paths.outputs.swift-path }}
 

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

@@ -402,7 +402,8 @@ 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=linux-android
+#sdk_base=linux-android
+sdk_base=swift-android
 #sdk_root="${sdk_base}-${android_sdk_version}.sdk"
 sdk_root="${sdk_base}.sdk"
 
@@ -453,7 +454,7 @@ for api in $(eval echo "{$android_api..35}"); do
 EOF
         fi
         cat >> swift-sdk.json <<EOF
-    "${arch}-${sdk_base}${api}": {
+    "${arch}-unknown-linux-android${api}": {
       "sdkRootPath": "ndk-sysroot",
       "swiftResourcesPath": "${sdk_root}/${arch}/usr/lib/swift",
       "swiftStaticResourcesPath": "${sdk_root}/${arch}/usr/lib/swift_static",