diff options
| author | Yi Kong <yikong@google.com> | 2019-03-18 21:37:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-18 21:37:39 -0700 |
| commit | 35badd74bf380ea64189e8882d6d6460806d598e (patch) | |
| tree | 51e31b2417e50f3b1e238a5faaea06be9f8f0a7e /cc/config | |
| parent | 638ec3a938689ccc0ecfba54cd0c31080375a352 (diff) | |
| parent | d182fd4f26fb0efab488c2b8a709fd0d06aa5d80 (diff) | |
| download | build_soong-35badd74bf380ea64189e8882d6d6460806d598e.tar.gz build_soong-35badd74bf380ea64189e8882d6d6460806d598e.tar.bz2 build_soong-35badd74bf380ea64189e8882d6d6460806d598e.zip | |
Merge "Switch clang to r353983" am: bdb1ed828d am: cc6ac6647f
am: d182fd4f26
Change-Id: I0daabff1c4ed0045115fb8fd2c7ef6542742518a
Diffstat (limited to 'cc/config')
| -rw-r--r-- | cc/config/clang.go | 4 | ||||
| -rw-r--r-- | cc/config/global.go | 4 |
2 files changed, 6 insertions, 2 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{ |