Swift Android build 6.2

Author: marcprux

.github/workflows/pull_request.yml

@@ -53,10 +53,9 @@ jobs:
       - name: Free Disk Space
         run: |
           df -h
-          # brings available space from 25G to 42G
-          #sudo rm -rf /usr/share/miniconda /usr/share/az* /usr/share/glade* /usr/local/lib/node_modules /usr/local/share/chromium /usr/local/share/powershell /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+          # brings available space from 25G to 32G
+          # otherwise we sometimes run out of space during the build
           sudo rm -rf /usr/share/miniconda /usr/share/az* /usr/share/glade* /usr/local/share/chromium /usr/local/share/powershell /usr/share/dotnet /opt/ghc /opt/hostedtoolcache/CodeQL
-          df -h
           sudo docker image prune --all --force
           sudo docker builder prune -a
           df -h
@@ -97,32 +96,8 @@ jobs:
           # swift-6.1-RELEASE_android-0.1-x86_64.artifactbundle.tar.gz.zip
           echo "artifact-name=${ARTIFACT_NAME}" >> $GITHUB_OUTPUT
 
-          #tree ${ARTIFACT_BUILD}/
           # show an abridged tree
-          tree ${ARTIFACT_BUILD} --filesfirst --prune -P 'Android.swiftmodule' -P 'libswiftAndroid.*' -P 'libFoundation.*' -P 'swiftrt.o' -P 'swift*.json' -P 'info.json' -P 'api-level.h' -P 'android.modulemap' -P 'SwiftAndroidNDK.h' -P 'bridging.modulemap'
-
-          # validate some required paths in the artifactbundle
-          #pushd ${ARTIFACT_BUILD}/*/*/usr
-            #ls lib/swift/android
-            #ls lib/swift/android/*
-            #ls lib/swift/android/*/swiftrt.o
-            #ls lib/*-linux-android/*/crtbegin_dynamic.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/*/libunwind.a
-          #popd
+          tree ${ARTIFACT_BUILD} --filesfirst --prune -P 'Android.swiftmodule' -P 'libswiftAndroid.*' -P 'libFoundation.*' -P 'swiftrt.o' -P 'swift*.json' -P 'info.json' -P 'api-level.h' -P 'android.modulemap' -P 'SwiftAndroidNDK.h' -P 'bridging.modulemap' -P 'linux' -P 'libclang*.a' -P 'libunwind.a' -P 'libclang_rt.builtins-*-android.a'
       - name: Upload SDK artifactbundle
         uses: actions/upload-artifact@v4
         with:

swift-ci/sdks/android/build

@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 # Swift Android SDK: Top-level Build Script
 
 # default architectures to build for

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

@@ -432,15 +432,10 @@ cp -a ${build_dir}/sdk_root ${sdk_staging}
 
 if [ "${NDK_LOCATION}" = "external" ]; then
     swift_res_root="swift-resources"
-    #ndk_sysroot=${ndk_installation}/sysroot
-    #ndk_sysroot=NONE
     ndk_sysroot="ndk-sysroot"
     cp -a ${ndk_installation}/sysroot ${ndk_sysroot}
 else
-    #sysroot_path="ndk-sysroot"
-    #sysroot_path="android-27c-sysroot"
     merged_sysroot_path="sysroot"
-
     swift_res_root=${merged_sysroot_path}
     ndk_sysroot=${merged_sysroot_path}
     cp -a ${ndk_installation}/sysroot ${ndk_sysroot}
@@ -507,16 +502,10 @@ if [ "${NDK_LOCATION}" = "external" ]; then
     # error: link command failed with exit code 1 (use -v to see invocation)
     # clang: error: no such file or directory: '${HOME}/.swiftpm/swift-sdks/swift-6.2-DEVELOPMENT-SNAPSHOT-2025-04-24-a-android-0.1.artifactbundle/swift-android/ndk-sysroot/usr/lib/swift/android/x86_64/swiftrt.o'
     # see: https://github.com/swiftlang/swift-driver/pull/1822#issuecomment-2762811807
-    if [ "${NDK_LOCATION}" = "external" ]; then
-        for arch in $archs; do
-            mkdir -p ${ndk_sysroot}/usr/lib/swift/android/${arch}
-            ln -srv ${swift_res_root}/usr/lib/swift-${arch}/android/${arch}/swiftrt.o ${ndk_sysroot}/usr/lib/swift/android/${arch}/swiftrt.o
-        done
-    else
-        # try brute copying swiftrt.o to EVERY directory to see if it gets picked up somehow
-        echo "Seeking workaround for swiftrt.o needing to be under sdkRoot"
-        #find ${swift_res_root} -type d -exec cp -av ${SWIFTRT} {} \;
-    fi
+    for arch in $archs; do
+        mkdir -p ${ndk_sysroot}/usr/lib/swift/android/${arch}
+        ln -srv ${swift_res_root}/usr/lib/swift-${arch}/android/${arch}/swiftrt.o ${ndk_sysroot}/usr/lib/swift/android/${arch}/swiftrt.o
+    done
 else
     rm -r ${swift_res_root}/usr/{include,lib}/{i686,riscv64}-linux-android
     rm -r ${swift_res_root}/usr/lib/swift/clang/lib/linux/*{i[36]86,riscv64}*