Swift Androd build

Author: marcprux

.github/workflows/pull_request.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Build Android SDK
         working-directory: swift-ci/sdks/android
         run: |
-          sudo apt install -q ninja-build
+          sudo apt install -q ninja-build patchelf
           # build all architectures
           #./build
 
@@ -60,6 +60,7 @@ 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
           echo "artifact-name=$(basename ${{ runner.temp }}/swift-android-sdk/products/*.artifactbundle.tar.gz)" >> $GITHUB_OUTPUT
           echo "artifact-path=$(realpath ${{ runner.temp }}/swift-android-sdk/products/*.artifactbundle.tar.gz)" >> $GITHUB_OUTPUT
@@ -73,7 +74,21 @@ jobs:
         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
+      - 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
+      - name: Test swift-algorithms on Android
+        uses: skiptools/swift-android-action@main
+        with:
+          #package-path: ${{ runner.temp }}/DemoProject
+          package-path: ${{ runner.temp }}/swift-algorithms
+          installed-sdk: x86_64-unknown-linux-android
+          installed-swift: ${{ steps.paths.outputs.swift-root }}
       - name: Build Demo Project
+        if: false
         run: |
           cd ${{ runner.temp }}
           mkdir DemoProject
@@ -87,18 +102,3 @@ jobs:
           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
-      - 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
-      - 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-swift: ${{ steps.paths.outputs.swift-path }}
-

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

@@ -444,23 +444,10 @@ cat > $ndk_sysroot_path/SDKSettings.json <<EOF
 }
 EOF
 
-
-#quiet_pushd ndk-sysroot/usr/lib
-# FIXME: need to merge the multiple x86_64 archs
-#ln -s ../../../swift-android.sdk/x86_64/usr/lib/swift
-#quiet_popd
-
-#mkdir "${sdk_root}"
-#quiet_pushd "${sdk_root}"
-#cp -R ${build_dir}/sdk_root/* .
-#quiet_popd
-
 cp -a ${build_dir}/sdk_root sdk_root
 # Copy necessary headers and libraries from the toolchain and NDK clang resource directories
-SYSROOT=${ndk_sysroot_path}
-TOOLCHAIN=$host_toolchain
-mkdir -pv $SYSROOT/usr/lib/swift/clang/lib
-cp -rv $TOOLCHAIN/lib/clang/*/include $SYSROOT/usr/lib/swift/clang
+mkdir -pv $ndk_sysroot_path/usr/lib/swift/clang/lib
+cp -rv $host_toolchain/lib/clang/*/include $ndk_sysroot_path/usr/lib/swift/clang
 
 for arch in $archs; do
     quiet_pushd sdk_root/${arch}/usr
@@ -473,14 +460,14 @@ for arch in $archs; do
             arch_triple="arm-linux-androideabi"
         fi
 
-        sdk_root_arch=../../../sdk_root/$arch/usr
-
         mkdir lib/${arch_triple}
-        mv $sdk_root_arch/lib/pkgconfig $sdk_root_arch/lib/swift/android/lib*.{a,so} lib/${arch_triple}
+        mv lib/pkgconfig lib/swift/android/lib*.{a,so} lib/${arch_triple}
 
         mv lib/swift_static lib/swift_static-$arch
         mv lib/lib*.a lib/swift_static-$arch/android
+
         rm -r lib/swift{,_static-$arch}/clang
+
         mkdir -p lib/swift/clang/lib
         cp -a ${ndk_toolchain}/lib/clang/*/lib/linux lib/swift/clang/lib
         ln -s ../swift/clang lib/swift_static-$arch/clang
@@ -494,21 +481,21 @@ rm -r ${ndk_sysroot_path}/usr/share/{doc,man}
 rm -r ${ndk_sysroot_path}/usr/{include,lib}/{i686,riscv64}-linux-android
 rm -r sdk_root
 
-# validate that some expected paths exists
+# validate that some expected paths exist
 quiet_pushd ${ndk_sysroot_path}/usr
     ls lib/swift/android
-    ls lib/swift/android/x86_64
-    ls lib/swift/android/x86_64/swiftrt.o
+    ls lib/swift/android/*
+    ls lib/swift/android/*/swiftrt.o
 
-    ls lib/swift_static-x86_64
-    ls lib/swift_static-x86_64/android
-    ls lib/swift_static-x86_64/android/libFoundationEssentials.a
+    ls lib/swift_static-*
+    ls lib/swift_static-*/android
+    ls lib/swift_static-*/android/libFoundationEssentials.a
 
     ls lib/swift/clang/lib
     ls lib/swift/clang/lib/linux
-    ls lib/swift/clang/lib/linux/x86_64
-    ls lib/swift/clang/lib/linux/x86_64/libunwind.a
-    ls lib/x86_64-linux-android/28/crtbegin_dynamic.o
+    ls lib/swift/clang/lib/linux/*
+    ls lib/swift/clang/lib/linux/*/libunwind.a
+    ls lib/*-linux-android/*/crtbegin_dynamic.o
 quiet_popd
 
 cat > swift-sdk.json <<EOF