Android SDK build

Author: marcprux

.github/workflows/pull_request.yml

@@ -35,19 +35,20 @@ jobs:
         run: ./build
 
    android-build:
-     name: Build Android ${{ matrix.arch }}
+     #name: Build Android ${{ matrix.arch }}
+     #strategy:
+       #fail-fast: false
+       #matrix:
+         #arch: [armv7,aarch64,x86_64]
+     name: Build Android SDK
      runs-on: ubuntu-24.04
-     timeout-minutes: 120
-     strategy:
-      fail-fast: false
-      matrix:
-        arch: [armv7,aarch64,x86_64,x86]
      steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Build Android SDK
         working-directory: swift-ci/sdks/android
         run: |
           sudo apt install ninja-build
-          TARGET_ARCHS=${{ matrix.arch }} ./build
+          #TARGET_ARCHS=${{ matrix.arch }} ./build
+          ./build
 

swift-ci/sdks/android/build

@@ -1,15 +1,8 @@
 #!/bin/bash -ex
 # Swift Android SDK: Top-level Build Script
 
-# the architecture(s) to build; on GH Actions we build everything
-if [[ -z "${CI}" ]]; then
-    TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64}
-    #TARGET_ARCHS=${TARGET_ARCHS:-aarch64}
-else
-    TARGET_ARCHS=${TARGET_ARCHS:-armv7,aarch64,x86_64,x86}
-    #TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64}
-    #TARGET_ARCHS=${TARGET_ARCHS:-aarch64}
-fi
+# default architectures to build for
+TARGET_ARCHS=${TARGET_ARCHS:-armv7,aarch64,x86_64}
 
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28

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

@@ -100,7 +100,7 @@ declare_package zlib "zlib" "Zlib" "https://zlib.net"
 # Parse command line arguments
 android_sdk_version=0.1
 sdk_name=
-archs=aarch64,armv7,x86_64,x86
+archs=aarch64,armv7,x86_64
 android_api=28
 build_type=Release
 parallel_jobs=$(($(nproc --all) + 2))
@@ -196,12 +196,16 @@ function quiet_popd {
 header "Swift Android SDK build script"
 
 swift_dir=$(realpath $(dirname "$swiftc")/..)
+HOST=linux-x86_64
+#HOST=$(uname -s -m | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
+ndk_toolchain=$ndk_home/toolchains/llvm/prebuilt/$HOST
+
 
 echo "Swift found at ${swift_dir}"
 echo "Host toolchain found at ${host_toolchain}"
 ${host_toolchain}/bin/swift --version
 echo "Android NDK found at ${ndk_home}"
-${toolchain}/bin/clang --version
+${ndk_toolchain}/bin/clang --version
 echo "Building for ${archs}"
 echo "Sources are in ${source_dir}"
 echo "Build will happen in ${build_dir}"
@@ -219,17 +223,12 @@ function run() {
     "$@"
 }
 
-HOST=linux-x86_64
-#HOST=$(uname -s -m | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
-
-ndktoolchain=$ndk_home/toolchains/llvm/prebuilt/$HOST
-
 for arch in $archs; do
     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" ;;
-        x86) target_host="x86-linux-android"; compiler_target_host="$target_host$android_api"; android_abi="x86" ;;
         x86_64) target_host="x86_64-linux-android"; compiler_target_host="$target_host$android_api"; android_abi="x86_64" ;;
+        x86) target_host="x86-linux-android"; compiler_target_host="$target_host$android_api"; android_abi="x86" ;;
         *) echo "Unknown architecture '$1'"; usage; exit 0 ;;
     esac
 
@@ -335,6 +334,9 @@ for arch in $archs; do
             RelWithDebInfo) build_type_flag="--release-debuginfo" ;;
         esac
 
+        # use an out-of-tree build folder, otherwise subsequent arch builds have conflicts
+        export SWIFT_BUILD_ROOT=${build_dir}/$arch/swift-project
+
         ./swift/utils/build-script \
             $build_type_flag \
             --reconfigure \