Merge "Switch clang to r353983"

am: bdb1ed828d

Change-Id: I1852d1b722211a2bb2ba8425e4e91fe19ad66811
This commit is contained in:
Yi Kong
2019-03-18 21:29:33 -07:00
committed by android-build-merger
3 changed files with 7 additions and 4 deletions

View File

@@ -175,6 +175,10 @@ func init() {
// Disable this warning because we don't care about behavior with older compilers. // Disable this warning because we don't care about behavior with older compilers.
"-Wno-return-std-move-in-c++11", "-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 // Extra cflags for projects under external/ directory

View File

@@ -120,8 +120,8 @@ var (
// prebuilts/clang default settings. // prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host" ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r349610" ClangDefaultVersion = "clang-r353983"
ClangDefaultShortVersion = "8.0.8" ClangDefaultShortVersion = "9.0.1"
// Directories with warnings from Android.bp files. // Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{ WarningAllowedProjects = []string{

View File

@@ -83,8 +83,7 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {
if lto.LTO() { if lto.LTO() {
var ltoFlag string var ltoFlag string
if Bool(lto.Properties.Lto.Thin) { if Bool(lto.Properties.Lto.Thin) {
ltoFlag = "-flto=thin" ltoFlag = "-flto=thin -fsplit-lto-unit"
} else { } else {
ltoFlag = "-flto" ltoFlag = "-flto"
} }