Skip to content

Commit bbce180

Browse files
committed
1 parent 7bfc734 commit bbce180

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

swift-ci/sdks/android/build-docker

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash -e
1+
#!/bin/bash -ex
22
#
33
# ===----------------------------------------------------------------------===
44
#
@@ -42,8 +42,11 @@ $DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX --build-arg SWIFT_TOOLC
4242
mkdir -p products
4343

4444
echo "build-script-impl start ========="
45+
ls -la $(find ${SDKROOT}/source -name build-script-impl)
4546
cat $(find source -name build-script-impl)
4647
echo "build-script-impl end ========="
48+
grep 'VALIDATING SYMBOLIC LINK' $(find ${SDKROOT}/source -name build-script-impl)
49+
4750

4851
$DOCKER run -i --rm \
4952
-v ./source:/source \

swift-ci/sdks/android/build-local

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash -e
1+
#!/bin/bash -ex
22
#
33
# ===----------------------------------------------------------------------===
44
#
@@ -56,8 +56,10 @@ fi
5656
mkdir -p ${SDKROOT}/products
5757

5858
echo "build-script-impl start ========="
59+
ls -la $(find ${SDKROOT}/source -name build-script-impl)
5960
cat $(find ${SDKROOT}/source -name build-script-impl)
6061
echo "build-script-impl end ========="
62+
grep 'VALIDATING SYMBOLIC LINK' $(find ${SDKROOT}/source -name build-script-impl)
6163

6264
./scripts/build.sh \
6365
--source-dir ${SDKROOT}/source \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ for patch in "$swift_android_patch" "$testing_patch" "$dispatch_patch"; do
5555
fi
5656

5757
echo "applying patch $patch in $PWD"
58-
git apply -C1 "$patch"
58+
git apply -v -C1 "$patch"
5959

6060
#if git apply -C1 --reverse --check "$patch" >/dev/null 2>&1 ; then
6161
# echo "already patched"

0 commit comments

Comments
 (0)