From d7feb380c132c8c744a58b0e57b7c86043e34877 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Thu, 12 Apr 2018 23:28:17 -0700 Subject: [PATCH] Update clang to r328903 Bug: http://b/77532044 * b/77967848 - Disable -Wc++98-compat-extra-semi Test: Test various targets in AOSP and internal branches. For Googlers, go/clang-r328903-testing Change-Id: If08dafb9ad993fb686dfd6eeb5e2d61a9c99bd0b --- cc/config/clang.go | 4 ++++ 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{