Merge "Update clang to r328903"
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 1323849..ba1cd3c 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -177,6 +177,10 @@
// 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 d998ca2..06f6f9a 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -124,8 +124,8 @@
// 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{