CI patch to cross-compile trunk SPM was upstreamed

Author: finagolfin

.github/workflows/sdks.yml

@@ -112,11 +112,6 @@ jobs:
 
           if [ ${{ matrix.version }} = 'trunk' ]; then
             EXTRA_FLAGS="-b -p --install-llbuild --skip-early-swift-driver"
-
-            wget -q https://patch-diff.githubusercontent.com/raw/apple/swift/pull/36917.diff
-            cd swift
-            patch -p1 < ../36917.diff
-            cd ..
           fi
 
           ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_LATEST_HOME --android-arch ${{ matrix.arch }} --android-api-level $ANDROID_API_LEVEL --android-icu-uc $SDK/usr/lib/libicuuc.so --android-icu-uc-include $SDK/usr/include --android-icu-i18n $SDK/usr/lib/libicui18n.so --android-icu-i18n-include $SDK/usr/include --android-icu-data $SDK/usr/lib/libicudata.so --build-swift-tools=0 --native-swift-tools-path=`pwd`/$SWIFT_TAG-ubuntu20.04/usr/bin --native-clang-tools-path=`pwd`/$SWIFT_TAG-ubuntu20.04/usr/bin --cross-compile-hosts=android-${{ matrix.arch }} --cross-compile-deps-path=$SDK --skip-local-build --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='clang-resource-dir-symlink;license;stdlib;sdk-overlay' $EXTRA_FLAGS