Skip to content

[android] Skip source fetch during android build-docker #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justice-adams-apple merged 4 commits into from
Apr 15, 2026
+16 −3
Merged

[android] Skip source fetch during android build-docker #538

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4213e4
[android] add --skip-fetch to android build script
justice-adams-apple Apr 6, 2026
0524e76
[android] fix perl flags
justice-adams-apple Apr 6, 2026
b34c2a8
[android] run docker with proxy args if set
justice-adams-apple Apr 6, 2026
73771e8
[android] build docker with proxy args if set
justice-adams-apple Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions swift-ci/sdks/android/build-docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ ANDROID_API=28
BASEPATH=$(dirname $(realpath $0))
cd ${BASEPATH}

SKIP_FETCH=false
while [ "$#" -gt 0 ]; do
case "$1" in
--skip-fetch) SKIP_FETCH=true ;;
*) break ;;
esac
shift
done

export SWIFT_VERSION=${1}
# note that WORKDIR must not be under the current checkout or the patches will fail to apply
WORKDIR=${2}
Expand All @@ -37,14 +46,16 @@ HOST_OS=ubuntu24.04
source ./scripts/toolchain-vars.sh

# Check-out and patch the sources
./scripts/fetch-source.sh --source-dir ${WORKDIR}/source
if [[ "$SKIP_FETCH" != "true" ]]; then
./scripts/fetch-source.sh --source-dir ${WORKDIR}/source
fi

# This `git grep` invocation in a trunk test fails in our Docker for some
# reason, so just turn it into a plain `grep` again.
perl -pi -e 's:"git",:#:' ${WORKDIR}/source/swift-project/swift/test/Misc/verify-swift-feature-testing.test-sh

# Work around swiftlang/swift-driver#1822 for now
perl -pi -g -we "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2if [[ -d \"\\\${ANDROID_NDK}\" ]]; then call ln -sf \"\\\${SWIFT_BUILD_PATH}/lib/swift\" \"\\\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib\"; fi#" ${WORKDIR}/source/swift-project/swift/utils/build-script-impl
perl -0777 -pi -e "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2if [[ -d \"\\\${ANDROID_NDK}\" ]]; then call ln -sf \"\\\${SWIFT_BUILD_PATH}/lib/swift\" \"\\\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib\"; fi#g" ${WORKDIR}/source/swift-project/swift/utils/build-script-impl

# 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' ${WORKDIR}/source/swift-project/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
Expand All @@ -71,9 +82,11 @@ fi
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 ${CONTAINER_NAME} .
$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 --build-arg http_proxy --build-arg https_proxy --build-arg HTTP_PROXY --build-arg HTTPS_PROXY -t ${CONTAINER_NAME} .

$DOCKER run -i --rm \
-e http_proxy -e https_proxy \
-e HTTP_PROXY -e HTTPS_PROXY \
-v ${WORKDIR}/source:/source \
-v ${WORKDIR}/products:/products:rw \
${CONTAINER_NAME} \
Expand Down
Loading