Author: marcprux

swift-ci/sdks/android/build-docker

@@ -41,7 +41,6 @@ $DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX --build-arg SWIFT_TOOLC
 
 mkdir -p products
 
-# Run the build
 $DOCKER run -i --rm \
           -v ./source:/source \
           -v ./products:/products \

swift-ci/sdks/android/build-local

@@ -48,11 +48,13 @@ if [[ ! -d ${ANDROID_NDK_HOME} ]]; then
     popd
 fi
 
-mkdir -p ${SDKROOT}/products
 
+# Check-out and patch the sources
 ./scripts/fetch-source.sh --source-dir ${SDKROOT}/source --swift-tag ${SWIFT_TAG}
 ./scripts/patch-sources.sh ${SDKROOT}/source
 
+mkdir -p ${SDKROOT}/products
+
 ./scripts/build.sh \
     --source-dir ${SDKROOT}/source \
     --products-dir ${SDKROOT}/products \

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

@@ -26,7 +26,11 @@ swift_android_patch="${patches_dir}/swift-android.patch"
 perl -pi -e 's/#if os\(Windows\)/#if os\(Android\)/g' $swift_android_patch
 
 # remove the need to link in android-execinfo
-perl -pi -e 's/dispatch android-execinfo/dispatch/g' $swift_android_patch
+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
 
 case "${BUILD_VERSION}" in
     release)
@@ -64,8 +68,8 @@ done
 
 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
+perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
 
 # need to un-apply libandroid-spawn since we don't need it for API28+
-perl -pi -e 's/MATCHES "Android"/MATCHES "AndroidDISABLED"/g' llbuild/lib/llvm/Support/CMakeLists.txt
-perl -pi -e 's/ STREQUAL Android\)/ STREQUAL AndroidDISABLED\)/g' swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+perl -pi -e 's;MATCHES "Android";MATCHES "AndroidDISABLED";g' llbuild/lib/llvm/Support/CMakeLists.txt
+perl -pi -e 's; STREQUAL Android\); STREQUAL AndroidDISABLED\);g' swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt