Test new Android overlay on the CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -87,7 +87,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/swift-${{ matrix.version }}-android-${{ matrix.arch }}-*-sdk.tar.xz
-          key: ${{ matrix.version }}-${{ steps.version.outputs.latest }}-${{ matrix.arch }}-sdk
+          key: ${{ matrix.version }}-${{ steps.version.outputs.latest }}-${{ matrix.arch }}-overlay-sdk
       - name: Clone
         uses: actions/checkout@v4
         with:
@@ -106,6 +106,7 @@ jobs:
           SDK=`pwd`/$SDK_NAME
 
           tar xf ~/$SWIFT_TAG-ubuntu22.04.tar.gz
+          ./$SWIFT_TAG-ubuntu22.04/usr/bin/swift --version
           git apply swift-android-ci.patch
           git apply -C1 swift-android.patch swift-android-both-ndks.patch
           if [[ ${{ matrix.version }} = 'release'* ]]; then
@@ -129,6 +130,12 @@ jobs:
             git apply -C0 swift-android-foundation-ndk26.patch
             if [ ${{ matrix.version }} = 'release-26d' ]; then
               git apply swift-android-stdlib-ndk26.patch
+            elif [ ${{ matrix.version }} = 'trunk' ]; then
+              git apply android-overlay/modulemap.patch android-overlay/overlay.patch android-overlay/foundation-fixes.patch android-overlay/import-android.patch android-overlay/swift-argument-parser.patch android-overlay/swift-system-tag.patch android-overlay/yams.patch
+              wget -q https://download.swift.org/tmp/pull-request/74027/849/ubuntu2004/PR-ubuntu2004.tar.gz
+              tar xf PR-ubuntu2004.tar.gz
+              rm -rf $SWIFT_TAG-ubuntu22.04/usr/
+              mv usr/ $SWIFT_TAG-ubuntu22.04/
             fi
           fi
           sed -i "s%/data/data/com.termux/files%$SDK%" $SDK/usr/lib/pkgconfig/sqlite3.pc
@@ -141,7 +148,7 @@ jobs:
           patchelf --set-rpath \$ORIGIN/../..:\$ORIGIN $SDK/usr/lib/swift/android/lib[FXs]*.so
 
           tar cJf ~/${SDK_NAME/-release/-${{ matrix.version }}}.tar.xz $SDK_NAME
-          rm -rf build/ $SDK_NAME
+          rm -rf build/ $SDK_NAME llvm-project/
       - name: Upload SDK
         uses: actions/upload-artifact@v4
         with:
@@ -154,7 +161,14 @@ jobs:
 
           if [ ! -d ${{ steps.version.outputs.tag }}-ubuntu22.04 ]; then
             tar xf ~/${{ steps.version.outputs.tag }}-ubuntu22.04.tar.gz
+            if [ ${{ matrix.version }} = 'trunk' ]; then
+              wget -q https://download.swift.org/tmp/pull-request/74027/849/ubuntu2004/PR-ubuntu2004.tar.gz
+              tar xf PR-ubuntu2004.tar.gz
+              rm -rf ${{ steps.version.outputs.tag }}-ubuntu22.04/usr/
+              mv usr/ ${{ steps.version.outputs.tag }}-ubuntu22.04/
+            fi
           fi
+          ./${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift --version
 
           tar xf ~/swift-${{ matrix.version }}-android-${{ matrix.arch }}*-sdk.tar.xz
       - name: Get Swift Argument Parser package
@@ -164,6 +178,9 @@ jobs:
           path: swift-argument-parser
       - name: Build Swift Argument Parser package
         run: |
+          if [ ${{ matrix.version }} = 'trunk' ]; then
+            git apply sdk-config/android-overlay/swift-argument-parser.patch
+          fi
           cd swift-argument-parser
           ../sdk-config/${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift build --build-tests --destination ../sdk-config/swift-*-sdk/usr/swiftpm-android-${{ matrix.arch }}.json -Xlinker -rpath -Xlinker \$ORIGIN/lib/swift/android
       - name: Get Swift crypto package
@@ -190,6 +207,12 @@ jobs:
           git apply ../sdk-config/swift-nio-disable-ecn-tests.patch ../sdk-config/swift-nio-filesystem-both-ndks.patch
           if [ ${{ matrix.version }} = 'release-25c' ]; then
             git apply -R ../sdk-config/swift-nio-ndk26.patch
+          elif [ ${{ matrix.version }} = 'trunk' ]; then
+            ../sdk-config/${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift package update
+            cd .build/checkouts/swift-system/
+            git apply ../../../../sdk-config/android-overlay/swift-system-checkout.patch
+            cd ../../..
+            git apply ../sdk-config/android-overlay/swift-nio.patch
           fi
           ../sdk-config/${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift build --build-tests --destination ../sdk-config/swift-*-sdk/usr/swiftpm-android-${{ matrix.arch }}.json -Xlinker -rpath -Xlinker \$ORIGIN/lib/swift/android
       - name: Get Swift Numerics package
@@ -209,6 +232,9 @@ jobs:
       - name: Build Swift System package
         run: |
           cd swift-system
+          if [ ${{ matrix.version }} = 'trunk' ]; then
+            git apply ../sdk-config/android-overlay/swift-system.patch
+          fi
           ../sdk-config/${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift build --build-tests --destination ../sdk-config/swift-*-sdk/usr/swiftpm-android-${{ matrix.arch }}.json -Xlinker -rpath -Xlinker \$ORIGIN/lib/swift/android
       - name: Get Swift Collections package
         uses: actions/checkout@v4
@@ -233,6 +259,9 @@ jobs:
       - name: Build Swift NIO SSH package
         run: |
           cd sns
+          if [ ${{ matrix.version }} = 'trunk' ]; then
+            git apply ../sdk-config/android-overlay/swift-nio-ssh.patch
+          fi
           sed -i "s%url: .*swift-\(\w\+\)\.git.*$%path: \"../swift-\1\"),%g" Package.swift
           ../sdk-config/${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift build --build-tests --destination ../sdk-config/swift-*-sdk/usr/swiftpm-android-${{ matrix.arch }}.json -Xlinker -rpath -Xlinker \$ORIGIN/lib/swift/android
       - name: Get Swift NIO SSL package
@@ -245,6 +274,8 @@ jobs:
           cd snl
           if [ ${{ matrix.version }} = 'release-25c' ]; then
             sed -i "s%#include <time%#include <signal.h>\n#include <time%" Sources/CNIOBoringSSL/include/CNIOBoringSSL_asn1.h
+          elif [ ${{ matrix.version }} = 'trunk' ]; then
+            git apply ../sdk-config/android-overlay/swift-nio-ssl.patch
           fi
           SWIFTCI_USE_LOCAL_DEPS=1 ../sdk-config/${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift build --build-tests --destination ../sdk-config/swift-*-sdk/usr/swiftpm-android-${{ matrix.arch }}.json -Xlinker -rpath -Xlinker \$ORIGIN/lib/swift/android
       - name: Get Yams package
@@ -254,6 +285,9 @@ jobs:
           path: yams
       - name: Build Yams package
         run: |
+          if [ ${{ matrix.version }} = 'trunk' ]; then
+            git apply sdk-config/android-overlay/yams.patch
+          fi
           cd yams
           sed -i "s% fixturesDirectory + \"/SourceKitten#289% \"/data/local/tmp/pack%" Tests/YamsTests/PerformanceTests.swift
           ../sdk-config/${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift build --build-tests --destination ../sdk-config/swift-*-sdk/usr/swiftpm-android-${{ matrix.arch }}.json -Xlinker -rpath -Xlinker \$ORIGIN/lib/swift/android
@@ -266,6 +300,9 @@ jobs:
         if: ${{ matrix.arch != 'armv7' }}
         run: |
           cd snh
+          if [ ${{ matrix.version }} = 'trunk' ]; then
+            git apply ../sdk-config/android-overlay/swift-nio-http2.patch
+          fi
           sed -i "s%url: .*swift-\(\w\+\)\.git.*$%path: \"../swift-\1\"),%g" Package.swift
           ../sdk-config/${{ steps.version.outputs.tag }}-ubuntu22.04/usr/bin/swift build --build-tests --destination ../sdk-config/swift-*-sdk/usr/swiftpm-android-${{ matrix.arch }}.json -Xlinker -rpath -Xlinker \$ORIGIN/lib/swift/android
       - name: Get Swift Algorithms package