Merge "Use the real compiler for compdb"
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 74e8ae8..0f22034 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -129,6 +129,9 @@
// Warnings from clang-7.0
"-Wno-deprecated-register",
"-Wno-sign-compare",
+
+ // Warnings from clang-8.0
+ "-Wno-defaulted-function-deleted",
}, " "))
pctx.StaticVariable("ClangExtraCppflags", strings.Join([]string{
diff --git a/cc/config/global.go b/cc/config/global.go
index 3e76373..057e08a 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -126,8 +126,8 @@
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
- ClangDefaultVersion = "clang-r339409b"
- ClangDefaultShortVersion = "8.0.2"
+ ClangDefaultVersion = "clang-r344140"
+ ClangDefaultShortVersion = "8.0.3"
// Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{