Author: marcprux

swift-ci/sdks/android/build-docker

@@ -11,6 +11,14 @@ TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28
+HOST_OS=ubuntu24.04
+source ./scripts/toolchain-vars.sh
+
+# Check-out and patch the sources
+./scripts/fetch-source.sh --source-dir ${PWD}/source --swift-tag ${SWIFT_TAG}
+./scripts/patch-sources.sh ${PWD}/source
+
+mkdir -p products
 
 if [[ "$DOCKER" == "" ]]; then
     DOCKER=docker
@@ -29,29 +37,15 @@ case $(arch) in
         ;;
 esac
 
-HOST_OS=ubuntu24.04
-source ./scripts/toolchain-vars.sh
+CONTAINER_NAME="swift-android"
 
 # Build the Docker image
-$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 ${PWD}/source --swift-tag ${SWIFT_TAG}
-./scripts/patch-sources.sh ${PWD}/source
-
-mkdir -p products
-
-echo "build-script-impl start ========="
-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 source -name build-script-impl)
-
+$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 ${CONTAINER_NAME} .
 
 $DOCKER run -i --rm \
           -v ./source:/source \
           -v ./products:/products \
-          swift-android \
+          ${CONTAINER_NAME} \
           /scripts/build.sh \
             --source-dir /source \
             --products-dir /products \

swift-ci/sdks/android/build-local

@@ -55,12 +55,6 @@ fi
 
 mkdir -p ${SDKROOT}/products
 
-echo "build-script-impl start ========="
-ls -la $(find ${SDKROOT}/source -name build-script-impl)
-cat $(find ${SDKROOT}/source -name build-script-impl)
-echo "build-script-impl end  ========="
-grep 'VALIDATING SYMBOLIC LINK' $(find ${SDKROOT}/source -name build-script-impl)
-
 ./scripts/build.sh \
     --source-dir ${SDKROOT}/source \
     --products-dir ${SDKROOT}/products \

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

@@ -21,10 +21,6 @@ fi
 cd ${source_dir}/swift-project
 swift_android_patch="${patches_dir}/swift-android.patch"
 
-ls -la swift/utils/build-script-impl
-ls -la ${swift_android_patch}
-ls -la swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
-
 # patch the patch, which seems to only be needed for an API less than 28
 # https://github.com/finagolfin/swift-android-sdk/blob/main/swift-android.patch#L110
 perl -pi -e 's/#if os\(Windows\)/#if os\(Android\)/g' $swift_android_patch
@@ -61,6 +57,7 @@ for patch in "$swift_android_patch" "$testing_patch" "$dispatch_patch"; do
     echo "applying patch $patch in $PWD…"
     # first check to make sure the patches can apply and fail if not
     git apply -v --check -C1 "$patch"
+    echo "git apply --check result: $0"
     git apply -v -C1 "$patch"
 
     #if git apply -C1 --reverse --check "$patch" >/dev/null 2>&1 ; then
@@ -73,10 +70,16 @@ for patch in "$swift_android_patch" "$testing_patch" "$dispatch_patch"; do
     #fi
 done
 
+# validate the patches
+ls -la swift/utils/build-script-impl
+grep 'VALIDATING SYMBOLIC LINK' swift/utils/build-script-impl
+
+
 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
 
 # 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
+