Author: marcprux

swift-ci/sdks/android/build-docker

@@ -42,10 +42,10 @@ $DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX --build-arg SWIFT_TOOLC
 mkdir -p products
 
 echo "build-script-impl start ========="
-ls -la $(find ${SDKROOT}/source -name build-script-impl)
+ls -la $(find source -name build-script-impl)
 cat $(find source -name build-script-impl)
 echo "build-script-impl end  ========="
-grep 'VALIDATING SYMBOLIC LINK' $(find ${SDKROOT}/source -name build-script-impl)
+grep 'VALIDATING SYMBOLIC LINK' $(find source -name build-script-impl)
 
 
 $DOCKER run -i --rm \

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

@@ -55,7 +55,7 @@ for patch in "$swift_android_patch" "$testing_patch" "$dispatch_patch"; do
     fi
 
     echo "applying patch $patch in $PWD…"
-    git apply -v -C1 "$patch"
+    git apply -v --unsafe-paths -C1 "$patch"
 
     #if git apply -C1 --reverse --check "$patch" >/dev/null 2>&1 ; then
     #    echo "already patched"