Only apply SPM patch for SQLite to trunk on CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -113,7 +113,7 @@ jobs:
           sed -i "s%cross_compile_config%cross_compile_config, '-Xlinker', '-landroid-spawn'%" sourcekit-lsp/Utilities/build-script-helper.py
 
           if [ ${{ matrix.version }} = 'trunk' ]; then
-            git apply package-patches/sourcekit-lsp-sqlite.patch
+            git apply package-patches/swiftpm-sqlite.patch
           else
             git apply swift-android-clang.patch
           fi

package-patches/sourcekit-lsp-sqlite.patch renamed to package-patches/swiftpm-sqlite.patch

@@ -12,3 +12,17 @@ index 17ad9e3..953fffd 100755
      return env
 
 
+diff --git a/swiftpm/Utilities/bootstrap b/swiftpm/Utilities/bootstrap
+index 085056de..1ded1a90 100755
+--- a/swiftpm/Utilities/bootstrap
++++ b/swiftpm/Utilities/bootstrap
+@@ -615,6 +615,9 @@
+         "SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path,
+     ]
+ 
++    if args.cross_compile_hosts and re.match('android-', args.cross_compile_hosts):
++        swiftpm_args.append("PKG_CONFIG_PATH=" + os.path.join(os.path.split(args.cross_compile_config)[0], "lib/pkgconfig"))
++
+     if args.bootstrap:
+         note("Building SwiftPM (with a freshly built swift-bootstrap)")
+         swiftpm_args.append("SWIFTPM_CUSTOM_LIBS_DIR=" + os.path.join(args.bootstrap_dir, "pm"))

swift-android-ci.patch

@@ -50,16 +50,6 @@ diff --git a/swiftpm/Utilities/bootstrap b/swiftpm/Utilities/bootstrap
 index 085056de..1ded1a90 100755
 --- a/swiftpm/Utilities/bootstrap
 +++ b/swiftpm/Utilities/bootstrap
-@@ -615,6 +615,9 @@
-         "SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path,
-     ]
- 
-+    if args.cross_compile_hosts and re.match('android-', args.cross_compile_hosts):
-+        swiftpm_args.append("PKG_CONFIG_PATH=" + os.path.join(os.path.split(args.cross_compile_config)[0], "lib/pkgconfig"))
-+
-     if args.bootstrap:
-         note("Building SwiftPM (with a freshly built swift-build)")
-         swiftpm_args.append("SWIFTPM_CUSTOM_LIBS_DIR=" + os.path.join(args.bootstrap_dir, "pm"))
 @@ -803,6 +806,7 @@
      if 'ANDROID_DATA' in os.environ or (args.cross_compile_hosts and re.match(
          'android-', args.cross_compile_hosts)):