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

am: d182fd4f26 Change-Id: I0daabff1c4ed0045115fb8fd2c7ef6542742518a
2019-03-18 21:37:39 -07:00
parent 638ec3a938 d182fd4f26
commit 35badd74bf
3 changed files with 7 additions and 4 deletions
--- 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