Checkout patches repo instead of using a git submodule

Author: marcprux

.github/workflows/pull_request.yml

@@ -67,8 +67,6 @@ jobs:
           echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          submodules: 'true'
       - name: Build Android SDK (Local)
         if: ${{ matrix.build-type == 'local' }}
         working-directory: swift-ci/sdks/android

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "swift-ci/sdks/android/resources/patches"]
-	path = swift-ci/sdks/android/resources/patches
-	url = https://github.com/swift-android-sdk/swift-android-sdk

swift-ci/sdks/android/resources/patches

@@ -91,6 +91,9 @@ fi
 if [[ -z "${BORINGSSL_VERSION}" ]]; then
     BORINGSSL_VERSION=fips-20220613
 fi
+if [[ -z "${SWIFT_ANDROID_PATCHES_VERSION}" ]]; then
+    SWIFT_ANDROID_PATCHES_VERSION=main
+fi
 
 clone_with_ssh=false
 while [ "$#" -gt 0 ]; do
@@ -139,7 +142,7 @@ mkdir -p swift-project
 groupstart "Fetching Swift"
 pushd swift-project >/dev/null
 
-[[ -d swift ]] || git clone ${github}apple/swift.git
+[[ -d swift ]] || git clone ${github}swiftlang/swift.git
 cd swift
 
 # Get its dependencies
@@ -181,3 +184,10 @@ git checkout ${BORINGSSL_VERSION}
 popd >/dev/null 2>&1
 groupend
 
+# Fetch BoringSSL
+groupstart "Fetching Patches"
+[[ -d swift-android-patches ]] || git clone https://github.com/swift-android-sdk/swift-android-sdk swift-android-patches
+pushd swift-android-patches >/dev/null 2>&1
+git checkout ${SWIFT_ANDROID_PATCHES_VERSION}
+popd >/dev/null 2>&1
+groupend

swift-ci/sdks/android/scripts/fetch-source.sh

@@ -3,16 +3,12 @@
 set -e
 
 source_dir=$1
-
 if [[ ! -d "${source_dir}" ]]; then
     echo "$0: source_dir ${source_dir} does not exist"
     exit 1
 fi
 
-script_dir=$(dirname -- "${BASH_SOURCE[0]}")
-resource_dir=$(realpath "${script_dir}/../resources")
-patches_dir="${resource_dir}/patches"
-
+patches_dir="${source_dir}/swift-android-patches"
 if [[ ! -d "${patches_dir}" ]]; then
     echo "$0: patches_dir ${patches_dir} does not exist"
     exit 1
@@ -21,10 +17,6 @@ fi
 cd ${source_dir}/swift-project
 swift_android_patch="${patches_dir}/swift-android.patch"
 
-ls -la swift/utils/build-script-impl
-ls -la ${swift_android_patch}
-ls -la swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
-
 # patch the patch, which seems to only be needed for an API less than 28
 # https://github.com/finagolfin/swift-android-sdk/blob/main/swift-android.patch#L110
 perl -pi -e 's/#if os\(Windows\)/#if os\(Android\)/g' $swift_android_patch