Author: marcprux

swift-ci/sdks/android/build-docker

@@ -6,6 +6,12 @@
 #
 # ===----------------------------------------------------------------------===
 
+# default architectures to build for
+TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
+
+ANDROID_NDK_VERSION=android-ndk-r27c
+ANDROID_API=28
+
 if [[ "$DOCKER" == "" ]]; then
     DOCKER=docker
 fi
@@ -26,15 +32,11 @@ esac
 HOST_OS=ubuntu24.04
 source ./scripts/toolchain-vars.sh
 
-ANDROID_API=28
-ANDROID_NDK_VERSION=android-ndk-r27c
-
 # 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 the sources
+# Check-out and patch the sources
 ./scripts/fetch-source.sh --source-dir source --swift-tag ${SWIFT_TAG}
-
 ./scripts/patch-sources.sh source
 
 mkdir -p products

swift-ci/sdks/android/scripts/build.sh

@@ -232,11 +232,6 @@ function run() {
 }
 
 for arch in $archs; do
-    # enable short-circuiting the individual builds
-    if [[ ! -z "$SWIFT_ANDROID_ARCHIVEONLY" ]]; then
-        continue
-    fi
-
     case $arch in
         armv7) target_host="arm-linux-androideabi"; compiler_target_host="armv7a-linux-androideabi$android_api"; android_abi="armeabi-v7a" ;;
         aarch64) target_host="aarch64-linux-android"; compiler_target_host="$target_host$android_api"; android_abi="arm64-v8a" ;;
@@ -629,13 +624,11 @@ EOF
 
 quiet_popd
 
-if [[ -z "$SWIFT_ANDROID_ARCHIVEONLY" ]]; then
-    header "Outputting compressed bundle"
+header "Outputting compressed bundle"
 
-    quiet_pushd "${build_dir}"
-        mkdir -p "${products_dir}"
-        tar czf "${products_dir}/${bundle}.tar.gz" "${bundle}"
-    quiet_popd
-fi
+quiet_pushd "${build_dir}"
+    mkdir -p "${products_dir}"
+    tar czf "${products_dir}/${bundle}.tar.gz" "${bundle}"
+quiet_popd
 
 groupend