Install the native host LLVM tools 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/patches/swift-android-trunk.patch

@@ -10,21 +10,3 @@ index 3f36fc979cb..8713ae8fea8 100755
              "grep",
              "--extended-regexp",
              "--recursive",
-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 9a0f5b43e2d..5c7d1320a2d 100644
---- a/swift/utils/swift_build_support/swift_build_support/cmake.py
-+++ b/swift/utils/swift_build_support/swift_build_support/cmake.py
-@@ -150,11 +150,8 @@ class CMake(object):
-             define("CMAKE_CXX_COMPILER_LAUNCHER:PATH", args.cmake_cxx_launcher)
- 
-         if self.prefer_native_toolchain and product:
--            clang_tools_path = product.native_clang_tools_path(args.host_target)
--            define("CMAKE_C_COMPILER:PATH", os.path.join(clang_tools_path,
--                                                         'bin', 'clang'))
--            define("CMAKE_CXX_COMPILER:PATH", os.path.join(clang_tools_path,
--                                                           'bin', 'clang++'))
-+            define("CMAKE_C_COMPILER:PATH", toolchain.cc)
-+            define("CMAKE_CXX_COMPILER:PATH", toolchain.cxx)
- 
-             toolchain_path = product.native_toolchain_path(args.host_target)
-             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',

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

@@ -411,6 +411,7 @@ for arch in $archs; do
                 build_cmark=""
                 local_build=""
                 build_llvm="1"
+                install_llvm="--install-llvm"
                 build_swift_tools="1"
                 validation_test="1"
                 native_swift_tools_path=""
@@ -420,6 +421,7 @@ for arch in $archs; do
                 build_cmark="--skip-build-cmark"
                 local_build="--skip-local-build"
                 build_llvm="0"
+                install_llvm=""
                 build_swift_tools="0"
                 validation_test="0"
                 native_swift_tools_path="--native-swift-tools-path=$host_toolchain/bin"
@@ -442,7 +444,7 @@ for arch in $archs; do
             --cross-compile-hosts=android-$arch \
             --cross-compile-deps-path=$sdk_root \
             --install-destdir=$sdk_root \
-            --build-llvm=$build_llvm \
+            --build-llvm=$build_llvm ${install_llvm} \
             --build-swift-tools=$build_swift_tools \
             ${native_swift_tools_path} \
             ${native_clang_tools_path} \
@@ -525,7 +527,7 @@ cp -r $host_toolchain/lib/clang/*/include $swift_res_root/usr/lib/swift/clang
 
 for arch in $archs; do
     quiet_pushd ${sdk_staging}/${arch}/usr
-        rm -r bin
+        rm -rf bin lib/clang local
         rm -r include/*
         cp -r ${swift_source_dir}/swift/lib/ClangImporter/SwiftBridging/{module.modulemap,swift} include/
 
@@ -536,7 +538,7 @@ for arch in $archs; do
 
         # need force rm in case linux is not present (when not running tests)
         rm -rf lib/swift{,_static}/{FrameworkABIBaseline,_InternalSwiftScan,_InternalSwiftStaticMirror,clang,embedded,host,linux,migrator}
-        rm -rf lib/lib*.so
+        rm -rf lib/lib*.so*
         mv lib/swift lib/swift-$arch
         ln -s ../swift/clang lib/swift-$arch/clang
 
@@ -558,7 +560,7 @@ for arch in $archs; do
     rsync -a ${sdk_staging}/${arch}/usr ${swift_res_root}
 done
 
-rm -r ${swift_res_root}/usr/share/{doc,man}
+rm -rf ${swift_res_root}/usr/share/{aclocal,doc,man}
 rm -r ${sdk_staging}
 
 # create an install script to set up the NDK links