Avoid merge conflicts by turning a sourcekit-lsp patch on the CI into a regex replacement instead

Author: finagolfin

.github/workflows/sdks.yml

@@ -141,6 +141,7 @@ jobs:
           fi
 
           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 }}"
 
           # e.g. swift-6.1-release-android-24-sdk

swift-android-ci-except-release.patch

@@ -1,15 +1,3 @@
-diff --git a/sourcekit-lsp/Utilities/build-script-helper.py b/sourcekit-lsp/Utilities/build-script-helper.py
-index d264f10c..7c69168e 100755
---- a/sourcekit-lsp/Utilities/build-script-helper.py
-+++ b/sourcekit-lsp/Utilities/build-script-helper.py
-@@ -136,6 +136,7 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace, suppress_verb
-     if '-android' in build_target:
-         swiftpm_args += [
-             '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android',
-+            '-Xlinker', '-landroid-spawn',
-         ]
-     elif not build_os.startswith('macosx'):
-         # Library rpath for swift, dispatch, Foundation, etc. when installing
 diff --git a/swift-build/Sources/SWBUtil/FSProxy.swift b/swift-build/Sources/SWBUtil/FSProxy.swift
 index b446d21..f88f3c3 100644
 --- a/swift-build/Sources/SWBUtil/FSProxy.swift

swift-android-ci-release.patch

@@ -1,15 +1,3 @@
-diff --git a/sourcekit-lsp/Utilities/build-script-helper.py b/sourcekit-lsp/Utilities/build-script-helper.py
-index bd31bec..4469cab 100755
---- a/sourcekit-lsp/Utilities/build-script-helper.py
-+++ b/sourcekit-lsp/Utilities/build-script-helper.py
-@@ -129,6 +129,7 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace) -> List[str]:
-         swiftpm_args += [
-             '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android',
-             # SwiftPM will otherwise try to compile against GNU strerror_r on
-+            '-Xlinker', '-landroid-spawn',
-             # Android and fail.
-             '-Xswiftc', '-Xcc', '-Xswiftc', '-U_GNU_SOURCE',
-         ]
 diff --git a/swift-system/Sources/System/Internals/CInterop.swift b/swift-system/Sources/System/Internals/CInterop.swift
 index 13abc75..2ad551a 100644
 --- a/swift-system/Sources/System/Internals/CInterop.swift