diff options
| author | 2021-08-08 21:02:29 +0000 | |
|---|---|---|
| committer | 2021-08-08 21:02:29 +0000 | |
| commit | 01cad0cddc98d47576c1d14a017d4b6a46c66fcc (patch) | |
| tree | 95dd71cfa8a0bb549dc7c090d25a5296195a53cc | |
| parent | baeca672c1e2a8efb3b2a1cdeac1a6d4c7e27bdb (diff) | |
| parent | 786c1d41ef5e135ebe6e3323cf29fb2b40bb0c35 (diff) | |
Merge "Revert "Switch to clang r428724 13.0.1.""
| -rw-r--r-- | cc/config/global.go | 6 | ||||
| -rw-r--r-- | cc/tidy.go | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cc/config/global.go b/cc/config/global.go index 248822f14..3daee3845 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -228,8 +228,6 @@ 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 @@ -268,8 +266,8 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r428724" - ClangDefaultShortVersion = "13.0.1" + ClangDefaultVersion = "clang-r416183b1" + ClangDefaultShortVersion = "12.0.7" // Directories with warnings from Android.bp files. WarningAllowedProjects = []string{ diff --git a/cc/tidy.go b/cc/tidy.go index fefa7f0f1..b2382e88a 100644 --- a/cc/tidy.go +++ b/cc/tidy.go @@ -146,8 +146,6 @@ 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") { |