Author: marcprux

swift-ci/sdks/android/build-docker

@@ -41,6 +41,10 @@ $DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX --build-arg SWIFT_TOOLC
 
 mkdir -p products
 
+echo "build-script-impl start ========="
+cat $(find source -name build-script-impl)
+echo "build-script-impl end  ========="
+
 $DOCKER run -i --rm \
           -v ./source:/source \
           -v ./products:/products \

swift-ci/sdks/android/build-local

@@ -55,6 +55,10 @@ fi
 
 mkdir -p ${SDKROOT}/products
 
+echo "build-script-impl start ========="
+cat $(find ${SDKROOT}/source -name build-script-impl)
+echo "build-script-impl end  ========="
+
 ./scripts/build.sh \
     --source-dir ${SDKROOT}/source \
     --products-dir ${SDKROOT}/products \

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

@@ -30,7 +30,7 @@ perl -pi -e 's;dispatch android-execinfo;dispatch;g' $swift_android_patch
 
 # debug symbolic link setup
 perl -pi -e 's;call ln -sf;call ln -svf;g' $swift_android_patch
-perl -pi -e 's%linux-x86_64/sysroot/usr/lib"%linux-x86_64/sysroot/usr/lib"; echo "VALIDATING SYMBOLIC LINK"; ls -la "${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib"; ls -la "${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift"; %g' $swift_android_patch
+perl -pi -e 's%linux-x86_64/sysroot/usr/lib"%linux-x86_64/sysroot/usr/lib"; echo "VALIDATING SYMBOLIC LINK"; ls -la "\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib"; ls -la "\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift"; %g' $swift_android_patch
 
 case "${BUILD_VERSION}" in
     release)