Only apply patches for 16 KB pages and CMake toolchain file for Testing to non-trunk branches on the CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -124,27 +124,26 @@ jobs:
 
           ANDROID_ARCH=aarch64 BUILD_SWIFT_PM=1 ${TOOLCHAIN}/bin/swift get-packages-and-swift-source.swift
 
-          git apply -C1 swift-android.patch swift-android-ci.patch swift-android-16k-pages.patch
+          git apply -C1 swift-android.patch swift-android-ci.patch
           BUILD_FLAG="--foundation-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
           if ${{ matrix.version == 'release' }}; then
             perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
             BUILD_FLAG+=" --build-swift-tools=0"
             LSP_BUILD="--sourcekit-lsp"
-            git apply swift-android-ci-release.patch swift-android-testing-release.patch
+            git apply swift-android-ci-release.patch swift-android-testing-release.patch swift-android-16k-pages.patch swift-android-testing.patch
           else
             if ${{ matrix.version == 'trunk' }}; then
               git apply swift-android-trunk-libdispatch.patch
               BUILD_FLAG+=" --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
             else
-              git apply swift-android-ci-devel.patch swift-android-devel.patch
+              git apply swift-android-ci-devel.patch swift-android-devel.patch swift-android-16k-pages.patch swift-android-testing.patch
             fi
             git apply -C2 swift-android-ci-except-release.patch
             BUILD_FLAG+=" --cross-compile-build-swift-tools=0"
             SDK_NAME=$(ls | grep swift-${{ matrix.version }}-android-aarch64)
             perl -pi -e 's%33%24%' $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/execinfo.h
           fi
 
-          git apply swift-android-testing.patch
           perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
           perl -pi -e "s%swift/android',%swift/android', '-Xlinker', '-landroid-spawn',%" sourcekit-lsp/Utilities/build-script-helper.py
           VERSION="$(echo ${{ steps.version.outputs.tag }} | cut -f1,2 -d-)-${{ matrix.version }}"