Swift Android build

Author: marcprux

.github/workflows/pull_request.yml

@@ -123,7 +123,8 @@ jobs:
           # recent releases require that ANDROID_NDK_ROOT *not* be set
           # see https://github.com/finagolfin/swift-android-sdk/issues/207
           echo "ANDROID_NDK_ROOT=" >> $GITHUB_ENV
-      - name: Build Demo Project
+
+      - name: Create Demo Project
         run: |
           cd ${{ runner.temp }}
           mkdir DemoProject
@@ -136,28 +137,25 @@ jobs:
           echo 'import FoundationNetworking' >> Sources/DemoProject/DemoProject.swift
           echo 'import Dispatch' >> Sources/DemoProject/DemoProject.swift
           echo 'import Android' >> Sources/DemoProject/DemoProject.swift
-          ${{ steps.info.outputs.swift-path }} build --build-tests --swift-sdk ${{ steps.info.outputs.sdk-id }}
       - name: Test Demo Project on Android
-        # only test for the complete arch SDK build to speed up CI
-        if: ${{ matrix.arch == '' }}
-        uses: skiptools/swift-android-action@main
+        uses: skiptools/swift-android-action@v2
         with:
+          # only test for the complete arch SDK build to speed up CI
+          run-tests: ${{ matrix.arch == '' }}
           package-path: ${{ runner.temp }}/DemoProject
           installed-sdk: ${{ steps.info.outputs.sdk-id }}
           installed-swift: ${{ steps.info.outputs.swift-root }}
-      - name: Build swift-algorithms
-        run: |
-          cd ${{ runner.temp }}
-          git clone https://github.com/apple/swift-algorithms.git
-          cd swift-algorithms
-          ${{ steps.info.outputs.swift-path }} build --build-tests --swift-sdk ${{ steps.info.outputs.sdk-id }}
-      - name: Test swift-algorithms on Android
-        # only test for the complete arch SDK build to speed up CI
-        if: ${{ matrix.arch == '' }}
-        uses: skiptools/swift-android-action@main
+
+      - name: Checkout swift-algorithms
+        uses: actions/checkout@v4
+        with:
+          repository: apple/swift-algorithms
+          path: swift-algorithms
+      - name: Test swift-algorithms
+        uses: skiptools/swift-android-action@v2
         with:
-          #package-path: ${{ runner.temp }}/DemoProject
-          package-path: ${{ runner.temp }}/swift-algorithms
+          run-tests: ${{ matrix.arch == '' }}
+          package-path: swift-algorithms
           installed-sdk: ${{ steps.info.outputs.sdk-id }}
           installed-swift: ${{ steps.info.outputs.swift-root }}
 

swift-ci/sdks/android/README.md

@@ -0,0 +1,43 @@
+# Build scripts for Swift Android SDK
+
+This folder contains scripts to build a Swift Android SDK 
+in the form of an artifactbundle.
+
+## Running
+
+The top-level `./build` script installs a host toolchain and the
+Android NDK, and then invokes `scripts/fetch-source.sh` which will
+fetch tagged sources for libxml2, curl, boringssl, and swift.
+
+It then applies some patches and invokes `scripts/build.sh`,
+which will build the sources for each of the specified
+architectures. Finally, it combines the NDK and the newly built
+SDKs into a single artifactbundle.  
+
+## Specifying Architectures
+
+By default all the supported Android architectures
+(`aarch64`, `x86_64`, `aarmv7`)
+will be built, but this can be reduced in order to speed
+up the build. This can be useful, e.g., as part of a CI that
+validates a pull request, as building a single architecture
+takes around 30 minutes on a standard ubuntu-24.04 GitHub runner,
+whereas building for all the architectures takes over an hour.
+
+To build an artifactbundle for just the `x86_64` architecture, run:
+
+```
+TARGET_ARCHS=x86_64 ./build
+```
+
+## Installing and validating the SDK
+
+The `.github/workflows/pull_request.yml` workflow
+will create and upload an installable SDK named something like:
+`swift-6.1-RELEASE_android-0.1.artifactbundle.tar.gz`
+
+The workflow will also install the SDK locally and use
+[swift-android-action](https://github.com/marketplace/actions/swift-android-action)
+to build and test various Swift packages in an Android emulator.
+
+

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

@@ -477,30 +477,6 @@ 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
-quiet_pushd ${sysroot_path}/usr
-    ls lib/swift/android
-    ls lib/swift/android/*
-    ls lib/swift/android/*/swiftrt.o
-
-    ls lib/swift_static-*
-    ls lib/swift_static-*/android
-    ls lib/swift_static-*/android/libFoundationEssentials.a
-
-    ls lib/*-linux-android/libFoundationEssentials.so
-    ls lib/*-linux-android/libFoundationNetworking.so
-    ls lib/*-linux-android/libFoundationInternationalization.so
-    ls lib/*-linux-android/lib_FoundationICU.so
-    ls lib/*-linux-android/libFoundationXML.so
-    ls lib/*-linux-android/libTesting.so
-
-    ls lib/swift/clang/lib
-    ls lib/swift/clang/lib/linux
-    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
 {
   "schemaVersion": "4.0",