Add --build-compiler option

Author: marcprux

.github/workflows/pull_request.yml

@@ -23,12 +23,13 @@ jobs:
             *.log
 
    android-build:
-     name: Build Android ${{ matrix.build-type }} ${{ matrix.swift-version }} ${{ matrix.arch }} SDK
+     name: Build Android ${{ matrix.build-type }} ${{ matrix.swift-version }} ${{ matrix.arch }} SDK (build-compiler=${{ matrix.build-compiler }})
      strategy:
        fail-fast: false
        matrix:
          #build-type: ['docker']
          build-type: ['docker', 'local']
+         build-compiler: ['0', '1']
          # blank arch builds all (aarch64,x86_64,armv7)
          #arch: ['']
          # builds only x86_64 to speed up the validation
@@ -53,6 +54,8 @@ jobs:
           # these variabes are used by build-docker and build-local
           # to determine which Swift version to build for
           echo "BUILD_SCHEME=${{ matrix.swift-version }}" >> $GITHUB_ENV
+          # pass the build-compiler matrix through to the build script
+          echo "BUILD_COMPILER=${{ matrix.build-compiler }}" >> $GITHUB_ENV
           echo "TARGET_ARCHS=${{ matrix.arch }}" >> $GITHUB_ENV
           echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
       - name: Checkout repository
@@ -99,6 +102,9 @@ jobs:
           if [[ "${{ matrix.build-type }}" == 'local' ]]; then
             ARTIFACT_NAME="${ARTIFACT_NAME}-local"
           fi
+          if [[ "${{ matrix.build-compiler }}" == '1' ]]; then
+            ARTIFACT_NAME="${ARTIFACT_NAME}-hostbuild"
+          fi
           # artifacts need a unique name so we suffix with the matrix arch(s)
           if [[ ! -z "${{ matrix.arch }}" ]]; then
             ARTIFACT_NAME="${ARTIFACT_NAME}-$(echo ${{ matrix.arch }} | tr ',' '-')"

swift-ci/sdks/android/build-docker

@@ -62,6 +62,7 @@ $DOCKER run -i --rm \
             --source-dir /source \
             --products-dir /products \
             --host-toolchain /usr/local/swift \
+            --build-compiler ${BUILD_COMPILER} \
             --android-api ${ANDROID_API} \
             --ndk-home /usr/local/ndk/${ANDROID_NDK_VERSION} \
             --archs ${TARGET_ARCHS}

swift-ci/sdks/android/build-local

@@ -58,6 +58,7 @@ mkdir -p ${WORKDIR}/products
     --source-dir ${WORKDIR}/source \
     --products-dir ${WORKDIR}/products \
     --build-dir ${WORKDIR}/build \
+    --build-compiler ${BUILD_COMPILER} \
     --host-toolchain ${HOST_TOOLCHAIN} \
     --android-api ${ANDROID_API} \
     --ndk-home ${ANDROID_NDK_HOME} \

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

@@ -63,6 +63,7 @@ Options:
   --source-dir <path>   Specify the path in which the sources can be found.
   --ndk-home <path>     Specify the path to the Android NDK
   --host-toolchain <tc> Specify the path to the host Swift toolchain
+  --build-compiler <bc> Whether to build and validate the host compiler
   --products-dir <path> Specify the path in which the products should be written.
   --build-dir <path>    Specify the path in which intermediates should be stored.
   --android-api <api>   Specify the Android API level
@@ -130,6 +131,8 @@ while [ "$#" -gt 0 ]; do
             ndk_home="$2"; shift ;;
         --host-toolchain)
             host_toolchain="$2"; shift ;;
+        --build-compiler)
+            build_compiler="$2"; shift ;;
         --build-dir)
             build_dir="$2"; shift ;;
         --android-api)
@@ -378,21 +381,48 @@ for arch in $archs; do
             RelWithDebInfo) build_type_flag="--release-debuginfo" ;;
         esac
 
+        case $build_compiler in
+            1|true|yes|YES)
+                build_cmark=""
+                local_build=""
+                build_llvm="1"
+                build_swift_tools="1"
+                validation_test="1"
+                native_swift_tools_path=""
+                native_clang_tools_path=""
+                ;;
+            *)
+                build_cmark="--skip-build-cmark"
+                local_build="--skip-local-build"
+                build_llvm="0"
+                build_swift_tools="0"
+                validation_test="0"
+                native_swift_tools_path="--native-swift-tools-path=$host_toolchain/bin"
+                native_clang_tools_path="--native-clang-tools-path=$host_toolchain/bin"
+                ;;
+        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 \
             --no-assertions \
-            --validation-test=1 \
+            --validation-test=$validation_test \
             --android \
             --android-ndk=$ndk_home \
             --android-arch=$arch \
             --android-api-level=$android_api \
             --cross-compile-hosts=android-$arch \
             --cross-compile-deps-path=$sdk_root \
             --install-destdir=$sdk_root \
+            --build-llvm=$build_llvm \
+            --build-swift-tools=$build_swift_tools \
+            ${native_swift_tools_path} \
+            ${native_clang_tools_path} \
+            ${build_cmark} \
+            ${local_build} \
             --build-swift-static-stdlib \
             --install-swift \
             --install-libdispatch \