From 786c1d41ef5e135ebe6e3323cf29fb2b40bb0c35 Mon Sep 17 00:00:00 2001
From: Yabin Cui <yabinc@google.com>
Date: Sun, 8 Aug 2021 20:59:59 +0000
Subject: [PATCH] Revert "Switch to clang r428724 13.0.1."

Revert submission 1743633-switch-to-clang-r428724

Reason for revert: fix build
Reverted Changes:
I824f3bc1c:Update bazel's clang version to clang-r428724
I6c4c26267:Adjust test for compiler update.
I94ab1f2dc:Switch to clang r428724 13.0.1.

Change-Id: I846e904b6e868d4e2be1bd8260ed59fc5464ef68
---
 cc/config/global.go | 6 ++----
 cc/tidy.go          | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cc/config/global.go b/cc/config/global.go
index 31107b314..bcee06afa 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -175,8 +175,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
@@ -215,8 +213,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") {