Fix patch application

Author: marcprux

swift-ci/sdks/android/build-docker

@@ -27,7 +27,7 @@ source ./scripts/toolchain-vars.sh
 
 # Check-out and patch the sources
 ./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-tag ${SWIFT_TAG}
-${WORKDIR}/patches/apply-patches.sh ${WORKDIR}/source/swift-project
+./patches/apply-patches.sh ${WORKDIR}/source/swift-project
 
 mkdir -p ${WORKDIR}/products
 chmod ugo+rwx ${WORKDIR}/products

swift-ci/sdks/android/build-local

@@ -52,7 +52,7 @@ fi
 
 # Check-out and patch the sources
 ./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-tag ${SWIFT_TAG}
-${WORKDIR}/patches/apply-patches.sh ${WORKDIR}/source/swift-project
+./patches/apply-patches.sh ${WORKDIR}/source/swift-project
 
 mkdir -p ${WORKDIR}/products
 

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

@@ -3,18 +3,7 @@
 patches_dir=$(dirname $(realpath -- "${BASH_SOURCE[0]}"))
 cd ${1}
 
-# 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' ${patches_dir}/swift-android.patch
-
-# remove the need to link in android-execinfo
-perl -pi -e 's;dispatch android-execinfo;dispatch;g' ${patches_dir}/swift-android.patch
-
 case "${BUILD_SCHEME}" in
-    release)
-        git apply -v -C1 ${patches_dir}/swift-android.patch
-        git apply -v -C1 ${patches_dir}/swift-android-testing-release.patch
-        ;;
     swift-*-branch)
         git apply -v -C1 ${patches_dir}/swift-android.patch
         git apply -v -C1 ${patches_dir}/swift-android-testing-except-release.patch
@@ -30,7 +19,6 @@ case "${BUILD_SCHEME}" in
         ;;
 esac
 
-perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
 # 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.patch

@@ -96,7 +96,7 @@ index 758dd1df..02970992 100644
  #endif
          try _throwIfPosixError(posix_spawnattr_init(&spawnAttrs))
 -#if os(Android)
-+#if os(Windows)
++#if os(Android)
          guard var spawnAttrs else {
              throw NSError(domain: NSPOSIXErrorDomain, code: Int(errno),
                            userInfo: [NSURLErrorKey:self.executableURL!])
@@ -136,7 +136,7 @@ index e40cb1b..ff2f920 100644
    if(NOT CMAKE_SYSTEM_NAME STREQUAL WASI)
      target_link_libraries(Testing PUBLIC
 -      dispatch)
-+      dispatch android-execinfo)
++      dispatch)
 +    list(GET CMAKE_FIND_ROOT_PATH 0 BT_DIR)
 +    target_include_directories(Testing PUBLIC ${BT_DIR}/usr/include)
 +    target_link_directories(Testing PUBLIC ${BT_DIR}/usr/lib)