From 46cad069d1be54b90d2cd24daf3ac257e73b34a0 Mon Sep 17 00:00:00 2001
From: Chris Li <lihongyu@google.com>
Date: Thu, 14 Jan 2021 19:48:49 +0000
Subject: [PATCH] Revert "To use same default for the nightly builds."

This reverts commit b063dc4221cf0604a7f8d577e7a5808380ad7c86.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=crosshatch-userdebug&lkgb=7080774&lkbb=7082597&fkbb=7080869, bug 177549474

Test: make
Change-Id: I8b6cf3b56fddde9832e1428a3d1aef00f19637fb
---
 cc/config/tidy.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/cc/config/tidy.go b/cc/config/tidy.go
index e5bea4b87..4ac9e5863 100644
--- a/cc/config/tidy.go
+++ b/cc/config/tidy.go
@@ -21,28 +21,23 @@ import (
 
 func init() {
 	// Most Android source files are not clang-tidy clean yet.
-	// Default global tidy checks must exclude all checks that
-	// have found too many false positives.
+	// Global tidy checks include only google*, performance*,
+	// and misc-macro-parentheses, but not google-readability*
+	// or google-runtime-references.
 	pctx.VariableFunc("TidyDefaultGlobalChecks", func(ctx android.PackageVarContext) string {
 		if override := ctx.Config().Getenv("DEFAULT_GLOBAL_TIDY_CHECKS"); override != "" {
 			return override
 		}
 		return strings.Join([]string{
-			"*",
-			"-altera-*",
+			"-*",
+			"bugprone*",
+			"clang-diagnostic-unused-command-line-argument",
+			"google*",
+			"misc-macro-parentheses",
+			"performance*",
 			"-bugprone-narrowing-conversions",
-			"-cppcoreguidelines-*",
-			"-fuchsia-*",
-			"-google-readability-*",
+			"-google-readability*",
 			"-google-runtime-references",
-			"-hicpp-*",
-			"-llvm-*",
-			"-llvmlibc-*",
-			"-misc-no-recursion",
-			"-misc-non-private-member-variables-in-classes",
-			"-misc-unused-parameters",
-			"-modernize-*",
-			"-readability-*",
 		}, ",")
 	})