Merge "Switch clang to r353983" am: bdb1ed828d am: cc6ac6647f

am: d182fd4f26

Change-Id: I0daabff1c4ed0045115fb8fd2c7ef6542742518a

3 files changed, 7 insertions, 4 deletions

diff --git a/cc/config/clang.go b/cc/config/clang.go
index bfa7873a..0a295e11 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -169,6 +169,10 @@ func init() {
 
 		// Disable this warning because we don't care about behavior with older compilers.
 		"-Wno-return-std-move-in-c++11",
+
+		// Disable -Wstring-plus-int until the instances detected by this new warning is
+		// fixed.
+		"-Wno-string-plus-int",
 	}, " "))
 
 	// Extra cflags for projects under external/ directory to disable warnings that are infeasible
diff --git a/cc/config/global.go b/cc/config/global.go
index 689b315b..e3fab0c2 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -120,8 +120,8 @@ var (
 
 	// prebuilts/clang default settings.
 	ClangDefaultBase         = "prebuilts/clang/host"
-	ClangDefaultVersion      = "clang-r349610"
-	ClangDefaultShortVersion = "8.0.8"
+	ClangDefaultVersion      = "clang-r353983"
+	ClangDefaultShortVersion = "9.0.1"
 
 	// Directories with warnings from Android.bp files.
 	WarningAllowedProjects = []string{
diff --git a/cc/lto.go b/cc/lto.go
index 63027486..0d7a2463 100644
--- a/cc/lto.go
+++ b/cc/lto.go
@@ -83,8 +83,7 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {
 	if lto.LTO() {
 		var ltoFlag string
 		if Bool(lto.Properties.Lto.Thin) {
-			ltoFlag = "-flto=thin"
-
+			ltoFlag = "-flto=thin -fsplit-lto-unit"
 		} else {
 			ltoFlag = "-flto"
 		}