Turn the last trunk-only patch into a perl substitution instead and reorganize the patches a bit

Author: finagolfin

swift-ci/sdks/android/patches/apply-patches.sh

@@ -2,21 +2,8 @@
 
 patches_dir=$(dirname $(realpath -- "${BASH_SOURCE[0]}"))
 cd ${1}
+git apply -v -C1 ${patches_dir}/swift-android.patch
 
-case "${BUILD_SCHEME}" in
-    swift-*-branch)
-        git apply -v -C1 ${patches_dir}/swift-android-devel.patch
-        git apply -v -C1 ${patches_dir}/swift-android.patch
-        ;;
-    development)
-        git apply -v -C1 ${patches_dir}/swift-android.patch
-        git apply -v -C1 ${patches_dir}/swift-android-trunk.patch
-        ;;
-    *)
-        echo "$0: invalid BUILD_SCHEME=${BUILD_SCHEME}"
-        exit 1
-        ;;
-esac
-
-# disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
-perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+if [[ "${BUILD_SCHEME}" == "swift-6.2-branch" ]]; then
+    git apply -v -C1 ${patches_dir}/swift-android-devel.patch
+fi

swift-ci/sdks/android/patches/swift-android-trunk.patch

@@ -433,6 +433,13 @@ for arch in $archs; do
         # use an out-of-tree build folder
         export SWIFT_BUILD_ROOT=${build_dir}/swift-project
 
+        # disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
+        perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+
+        # This `git grep` invocation in a trunk test fails in our Docker for some
+        # reason, so just turn it into a plain `grep` again.
+        perl -pi -e 's:"git",:#:' swift/test/Misc/verify-swift-feature-testing.test-sh
+
         ./swift/utils/build-script \
             $build_type_flag \
             --reconfigure \