Author: marcprux

swift-ci/sdks/android/build-docker

@@ -36,8 +36,8 @@ source ./scripts/toolchain-vars.sh
 $DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX --build-arg SWIFT_TOOLCHAIN_URL=$SWIFT_TOOLCHAIN_URL --build-arg ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION -t swift-android .
 
 # Check-out and patch the sources
-./scripts/fetch-source.sh --source-dir source --swift-tag ${SWIFT_TAG}
-./scripts/patch-sources.sh source
+./scripts/fetch-source.sh --source-dir ${PWD}/source --swift-tag ${SWIFT_TAG}
+./scripts/patch-sources.sh ${PWD}/source
 
 mkdir -p products
 

swift-ci/sdks/android/scripts/patch-sources.sh

@@ -55,15 +55,16 @@ for patch in "$swift_android_patch" "$testing_patch" "$dispatch_patch"; do
     fi
 
     echo "applying patch $patch in $PWD…"
+    git apply -C1 "$patch"
 
-    if git apply -C1 --reverse --check "$patch" >/dev/null 2>&1 ; then
-        echo "already patched"
-    elif git apply -C1 "$patch" ; then
-        echo "done"
-    else
-        echo "failed to apply patch $patch in $PWD"
-        exit 1
-    fi
+    #if git apply -C1 --reverse --check "$patch" >/dev/null 2>&1 ; then
+    #    echo "already patched"
+    #elif git apply -C1 "$patch" ; then
+    #    echo "done"
+    #else
+    #    echo "failed to apply patch $patch in $PWD"
+    #    exit 1
+    #fi
 done
 
 perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift