Install LLVM for full compiler builds

Author: finagolfin

swift-ci/sdks/android/patches/swift-android-devel.patch

@@ -1,20 +1,3 @@
-diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swift/utils/swift_build_support/swift_build_support/cmake.py
-index bfb69965890..b5e9f5349c2 100644
---- a/swift/utils/swift_build_support/swift_build_support/cmake.py
-+++ b/swift/utils/swift_build_support/swift_build_support/cmake.py
-@@ -153,10 +153,8 @@ class CMake(object):
-             toolchain_path = product.native_toolchain_path(args.host_target)
-             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
-                                           os.path.join(toolchain_path, 'bin', 'swiftc'))
--            define("CMAKE_C_COMPILER:PATH", os.path.join(toolchain_path,
--                                                         'bin', 'clang'))
--            define("CMAKE_CXX_COMPILER:PATH", os.path.join(toolchain_path,
--                                                           'bin', 'clang++'))
-+            define("CMAKE_C_COMPILER:PATH", toolchain.cc)
-+            define("CMAKE_CXX_COMPILER:PATH", toolchain.cxx)
-             define("CMAKE_Swift_COMPILER:PATH", cmake_swiftc_path)
-         else:
-             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER', toolchain.swiftc)
 diff --git a/swift/utils/swift_build_support/swift_build_support/products/product.py b/swift/utils/swift_build_support/swift_build_support/products/product.py
 index 47e7ab79905..d88c3c242ad 100644
 --- a/swift/utils/swift_build_support/swift_build_support/products/product.py

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

@@ -408,7 +408,7 @@ for arch in $archs; do
 
         case $build_compiler in
             1|true|yes|YES)
-                build_cmark=""
+                build_cmark="--install-llvm"
                 local_build=""
                 build_llvm="1"
                 build_swift_tools="1"