Turn the last modifications into perl substitutions instead and remove all non-6.2 patches

Author: finagolfin

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

@@ -3,20 +3,16 @@
 patches_dir=$(dirname $(realpath -- "${BASH_SOURCE[0]}"))
 cd ${1}
 
-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
+if [[ "${BUILD_SCHEME}" == "swift-6.2-branch" ]]; then
+    git apply -v -C1 ${patches_dir}/swift-android-devel.patch
+else
+    # 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
+fi
+
+# Work around swiftlang/swift-driver#1822 for now
+perl -pi -g -we "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2if [[ -d \"\\\${ANDROID_NDK}\" ]]; then call ln -sf \"\\\${SWIFT_BUILD_PATH}/lib/swift\" \"\\\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib\"; fi#" swift/utils/build-script-impl
 
 # 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

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

@@ -235,11 +235,6 @@ ndk_home=$ndk_home_tmp
 ndk_installation=$ndk_home/toolchains/llvm/prebuilt/$HOST
 ndk_clang_version=18
 
-# ANDROID_NDK env needed by the swift-android.patch for:
-# call ln -sf "${SWIFT_BUILD_PATH}/lib/swift" "${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib"
-export ANDROID_NDK_HOME=$ndk_home
-export ANDROID_NDK=$ndk_home
-
 echo "Swift found at ${swift_dir}"
 if [[ ! -z "${host_toolchain}" ]]; then
     echo "Host toolchain found at ${host_toolchain}"