diff options
| author | 2018-05-03 14:55:21 +0000 | |
|---|---|---|
| committer | 2018-05-03 14:55:21 +0000 | |
| commit | 470969df19079ad1c2eeb94fcc984ca2ce5e68ab (patch) | |
| tree | 345cb353087d565d9041a40ca80a6ea957fdbf0d | |
| parent | 93b48182016d46b0a117d455a0297328f972bada (diff) | |
| parent | d7feb380c132c8c744a58b0e57b7c86043e34877 (diff) | |
Merge "Update clang to r328903"
| -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 132384950..ba1cd3c01 100644 --- a/cc/config/clang.go +++ b/cc/config/clang.go @@ -177,6 +177,10 @@ func init() { // warning are fixed. "-Wno-enum-compare", "-Wno-enum-compare-switch", + + // Disable c++98-specific warning since Android is not concerned with C++98 + // compatibility. + "-Wno-c++98-compat-extra-semi", }, " ")) } diff --git a/cc/config/global.go b/cc/config/global.go index d998ca2d9..06f6f9ae6 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -124,8 +124,8 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-4679922" - ClangDefaultShortVersion = "7.0.1" + ClangDefaultVersion = "clang-r328903" + ClangDefaultShortVersion = "7.0.2" // Directories with warnings from Android.bp files. WarningAllowedProjects = []string{ |