diff --git a/cc/config/global.go b/cc/config/global.go index 3daee3845..248822f14 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -228,6 +228,8 @@ var ( "-Wno-non-c-typedef-for-linkage", // http://b/161304145 // New warnings to be fixed after clang-r407598 "-Wno-string-concatenation", // http://b/175068488 + // New warnings to be fixed after clang-r428724 + "-Wno-align-mismatch", // http://b/193679946 } // Extra cflags for external third-party projects to disable warnings that @@ -266,8 +268,8 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r416183b1" - ClangDefaultShortVersion = "12.0.7" + ClangDefaultVersion = "clang-r428724" + ClangDefaultShortVersion = "13.0.1" // Directories with warnings from Android.bp files. WarningAllowedProjects = []string{ diff --git a/cc/tidy.go b/cc/tidy.go index b2382e88a..fefa7f0f1 100644 --- a/cc/tidy.go +++ b/cc/tidy.go @@ -146,6 +146,8 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags { tidyChecks = tidyChecks + ",-bugprone-signed-char-misuse" // http://b/155034972 tidyChecks = tidyChecks + ",-bugprone-branch-clone" + // http://b/193716442 + tidyChecks = tidyChecks + ",-bugprone-implicit-widening-of-multiplication-result" flags.TidyFlags = append(flags.TidyFlags, tidyChecks) if ctx.Config().IsEnvTrue("WITH_TIDY") {