Merge "Revert "Switch to clang r428724 13.0.1.""

This commit is contained in:
Yabin Cui
2021-08-08 21:02:29 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 6 deletions

View File

@@ -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{