From 9e43137e55a42cd9351dd7bbcf3e48f8a67de6ba Mon Sep 17 00:00:00 2001
From: Finagolfin <finagolfin@tuta.io>
Date: Fri, 10 Jul 2026 22:01:09 +0530
Subject: [PATCH 1/2] Update trunk Android CI to NDK 30 beta 2

---
 swift-ci/sdks/android/build-docker | 14 ++++++++++----
 swift-ci/sdks/android/build-local  |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/swift-ci/sdks/android/build-docker b/swift-ci/sdks/android/build-docker
index a79e32c2..d291ab80 100755
--- a/swift-ci/sdks/android/build-docker
+++ b/swift-ci/sdks/android/build-docker
@@ -53,10 +53,16 @@ fi
 # Work around swiftlang/swift-driver#1822 for now
 perl -0777 -pi -e "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2if [[ -d \"\\\${ANDROID_NDK}\" ]]; then call ln -sf \"\\\${SWIFT_BUILD_PATH}/lib/swift\" \"\\\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib\"; fi#g" ${WORKDIR}/source/swift-project/swift/utils/build-script-impl
 
-# Push trunk back to build against Android API 23 with NDK 28c
-if [[ -n "${SWIFT_VERSION}" && ($SWIFT_VERSION != scheme:release/6.3 && $SWIFT_VERSION != tag:swift-6.3-*) ]]; then
-    ANDROID_NDK_VERSION=android-ndk-r28c
-    ANDROID_API=23
+# Push 6.4 and trunk back to build against Android API 23 with newer NDKs
+if [[ -n "${SWIFT_VERSION}" ]]; then
+    if [[ $SWIFT_VERSION != scheme:release/6.3 && $SWIFT_VERSION != tag:swift-6.3-* ]]; then
+        ANDROID_API=23
+        if [[ $SWIFT_VERSION == scheme:main || $SWIFT_VERSION == tag:swift-DEV* ]]; then
+            ANDROID_NDK_VERSION=android-ndk-r30-beta2
+        else
+            ANDROID_NDK_VERSION=android-ndk-r28c
+        fi
+    fi
 fi
 
 mkdir -p ${WORKDIR}/products
diff --git a/swift-ci/sdks/android/build-local b/swift-ci/sdks/android/build-local
index 3ee6f22e..46994303 100755
--- a/swift-ci/sdks/android/build-local
+++ b/swift-ci/sdks/android/build-local
@@ -17,7 +17,7 @@
 # default architectures to build for
 TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 
-ANDROID_NDK_VERSION=android-ndk-r28c
+ANDROID_NDK_VERSION=android-ndk-r30-beta2
 ANDROID_API=23
 
 BASEPATH=$(dirname $(realpath $0))

From bf9e4390a44bc4b94112d884d2c183dad71ad9e6 Mon Sep 17 00:00:00 2001
From: Finagolfin <finagolfin@tuta.io>
Date: Fri, 10 Jul 2026 22:01:55 +0530
Subject: [PATCH 2/2] Build and test Android SDK with new NDK

---
 .github/workflows/pull_request.yml | 133 +++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 4a0f0046..e2dcbc7e 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -25,3 +25,136 @@ jobs:
           name: docker-logs
           path: |
             *.log
+
+   android-build:
+     name: Android ${{ matrix.build-type }} ${{ matrix.swift-version }} ${{ matrix.arch }} ${{ matrix.runner }} (compiler=${{ matrix.build-compiler }})
+     strategy:
+       fail-fast: false
+       matrix:
+         include:
+           - swift-version: 'scheme:main'
+             # tag:swift-DEVELOPMENT-SNAPSHOT-2026-02-06-a'
+             build-type: 'docker'
+             build-compiler: '1'
+             runner: 'ubuntu-24.04'
+           - swift-version: 'scheme:release/6.4'
+             # tag:swift-6.3-DEVELOPMENT-SNAPSHOT-2026-02-14-a'
+             build-type: 'local'
+             build-compiler: '1'
+             runner: 'ubuntu-24.04'
+     runs-on: ${{ matrix.runner }}
+     steps:
+      - name: Free Disk Space
+        run: |
+          df -h
+          # 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 /usr/local/graalvm/ /usr/local/.ghcup/ /usr/local/lib/node_modules /usr/local/share/boost
+          sudo docker image prune --all --force
+          sudo docker builder prune -a
+          df -h
+      - name: Setup
+        id: config
+        run: |
+          # these variabes are used by build-docker and build-local
+          # to determine which Swift version to build for
+          echo "SWIFT_VERSION=${{ matrix.swift-version }}" >> $GITHUB_ENV
+          # pass the build-compiler matrix through to the build script
+          echo "BUILD_COMPILER=${{ matrix.build-compiler }}" >> $GITHUB_ENV
+          echo "TARGET_ARCHS=${{ matrix.arch }}" >> $GITHUB_ENV
+          echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Build Android SDK (Local)
+        if: ${{ matrix.build-type == 'local' }}
+        working-directory: swift-ci/sdks/android
+        run: |
+          sudo apt install -q patchelf build-essential cmake ninja-build python3 golang git gnupg2 libcurl4-openssl-dev libedit-dev libicu-dev libncurses5-dev libpython3-dev libsqlite3-dev libxml2-dev rsync uuid-dev uuid-runtime tzdata curl unzip
+          ./build-local ${SWIFT_VERSION} ${WORKDIR}
+      - name: Build Android SDK (Docker)
+        if: ${{ matrix.build-type == 'docker' }}
+        working-directory: swift-ci/sdks/android
+        run: |
+          ./build-docker ${SWIFT_VERSION} ${WORKDIR}
+      - name: Install Host Toolchain
+        if: ${{ matrix.build-type == 'docker' }}
+        working-directory: swift-ci/sdks/android
+        run: |
+          # when building in a Docker container, we don't have a local host toolchain,
+          # but we need one in order to run the SDK validation tests, so we install it now
+          HOST_OS=ubuntu$(lsb_release -sr)
+          source ./scripts/toolchain-vars.sh
+          mkdir -p ${WORKDIR}/host-toolchain
+          ./scripts/install-swift.sh ${WORKDIR}/host-toolchain/$SWIFT_BASE/usr
+          ls ${WORKDIR}/host-toolchain
+          ${WORKDIR}/host-toolchain/*/usr/bin/swift --version
+      - name: Get artifact info
+        id: info
+        shell: bash
+        run: |
+          set -ex
+          SWIFT_ROOT=$(dirname ${WORKDIR}/host-toolchain/*/usr)
+          echo "swift-root=${SWIFT_ROOT}" >> $GITHUB_OUTPUT
+          echo "swift-path=${SWIFT_ROOT}/usr/bin/swift" >> $GITHUB_OUTPUT
+
+          ARTIFACT_PATH=$(realpath ${WORKDIR}/products/*.artifactbundle.tar.gz)
+          echo "artifact-path=${ARTIFACT_PATH}" >> $GITHUB_OUTPUT
+          echo "sdk-id=x86_64-unknown-linux-android28" >> $GITHUB_OUTPUT
+
+          ARTIFACT_EXT=".artifactbundle.tar.gz"
+          ARTIFACT_NAME="$(basename ${ARTIFACT_PATH} ${ARTIFACT_EXT})"
+          # depending on whether we are building locally or in a container, add a maker to the name
+          if [[ "${{ matrix.build-type }}" == 'local' ]]; then
+            ARTIFACT_NAME="${ARTIFACT_NAME}-local"
+          fi
+          if [[ "${{ matrix.build-compiler }}" == '1' ]]; then
+            ARTIFACT_NAME="${ARTIFACT_NAME}-hostbuild"
+          fi
+          # artifacts need a unique name so we suffix with the matrix arch(s)
+          if [[ ! -z "${{ matrix.arch }}" ]]; then
+            ARTIFACT_NAME="${ARTIFACT_NAME}-$(echo ${{ matrix.arch }} | tr ',' '-')"
+          fi
+          ARTIFACT_NAME="${ARTIFACT_NAME}${ARTIFACT_EXT}"
+
+          # There is no way to prevent even a single-file artifact from being zipped:
+          # https://github.com/actions/upload-artifact?tab=readme-ov-file#zip-archives
+          # so the actual artifact download will look like:
+          # swift-6.1-RELEASE_android-0.1-x86_64.artifactbundle.tar.gz.zip
+          echo "artifact-name=${ARTIFACT_NAME}" >> $GITHUB_OUTPUT
+      - name: Upload SDK artifactbundle
+        uses: actions/upload-artifact@v4
+        with:
+          compression-level: 0
+          name: ${{ steps.info.outputs.artifact-name }}
+          path: ${{ steps.info.outputs.artifact-path }}
+      - name: Cleanup
+        run: |
+          # need to free up some space or else when installing we get: No space left on device
+          df -h
+          rm -rf ${WORKDIR}/{build,source}
+          sudo docker image prune --all --force
+          sudo docker builder prune -a
+          df -h
+      - name: Install artifactbundle
+        shell: bash
+        run: |
+          set -ex
+          ${{ steps.info.outputs.swift-path }} sdk install ${{ steps.info.outputs.artifact-path }}
+          ${{ steps.info.outputs.swift-path }} sdk configure --show-configuration $(${{ steps.info.outputs.swift-path }} sdk list | head -n 1) ${{ steps.info.outputs.sdk-id }}
+          # recent releases require that ANDROID_NDK_ROOT *not* be set
+          # see https://github.com/swiftlang/swift-driver/pull/1879
+          echo "ANDROID_NDK_ROOT=" >> $GITHUB_ENV
+
+      - name: Create Demo Project
+        run: |
+          cd ${{ runner.temp }}
+          mkdir DemoProject
+          cd DemoProject
+          ${{ steps.info.outputs.swift-path }} --version
+          ${{ steps.info.outputs.swift-path }} package init
+          echo 'import Foundation' >> Sources/DemoProject/DemoProject.swift
+          echo 'import FoundationEssentials' >> Sources/DemoProject/DemoProject.swift
+          echo 'import FoundationXML' >> Sources/DemoProject/DemoProject.swift
+          echo 'import FoundationNetworking' >> Sources/DemoProject/DemoProject.swift
+          echo 'import Dispatch' >> Sources/DemoProject/DemoProject.swift
+          echo 'import Android' >> Sources/DemoProject/DemoProject.swift