Swift Androd build

Author: marcprux

.github/workflows/pull_request.yml

@@ -60,8 +60,9 @@ jobs:
       - name: Get artifact info
         id: paths
         run: |
-          echo "swift-root=$(dirname ${{ runner.temp }}/swift-android-sdk/host-toolchain/*/usr)" >> $GITHUB_OUTPUT
-          echo "swift-path=$(ls ${{ runner.temp }}/swift-android-sdk/host-toolchain/*/usr/bin/swift)" >> $GITHUB_OUTPUT
+          SWIFT_ROOT=$(dirname ${{ runner.temp }}/swift-android-sdk/host-toolchain/*/usr)
+          echo "swift-root=${SWIFT_ROOT}" >> $GITHUB_OUTPUT
+          echo "swift-path=${SWIFT_ROOT}/usr/bin/swift" >> $GITHUB_OUTPUT
 
           ARTIFACT_PATH=$(realpath ${{ runner.temp }}/swift-android-sdk/products/*.artifactbundle.tar.gz)
           echo "artifact-path=${ARTIFACT_PATH}" >> $GITHUB_OUTPUT
@@ -85,7 +86,7 @@ jobs:
       - name: Install SDK
         run: |
           ${{ steps.paths.outputs.swift-path }} sdk install ${{ steps.paths.outputs.artifact-path }}
-          ${{ steps.paths.outputs.swift-path }} sdk configure --show-configuration $(${{ steps.paths.outputs.swift-path }} sdk list | head -n 1) x86_64-unknown-linux-android
+          ${{ steps.paths.outputs.swift-path }} sdk configure --show-configuration $(${{ steps.paths.outputs.swift-path }} sdk list | head -n 1) x86_64-unknown-linux-android28
       - name: Build swift-algorithms
         run: |
           cd ${{ runner.temp }}

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

@@ -474,6 +474,7 @@ done
 
 rm -r ${sysroot_path}/usr/share/{doc,man}
 rm -r ${sysroot_path}/usr/{include,lib}/{i686,riscv64}-linux-android
+rm -r ${sysroot_path}/usr/lib/swift/clang/lib/linux/*{i[36]86,riscv64}*
 rm -r ${sdk_staging}
 
 # validate that some expected paths exist