From 8b5ecb84558b72b71353e34dc0815ebc6baf63f9 Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Mon, 15 Aug 2022 14:36:02 -0700
Subject: [PATCH] Fix broken aosp-master-plus-llvm builds

* New flags cannot be added before llvm_android
  has a new version.

Bug: 241941550
Bug: 241601211
Test: presubmit
Change-Id: Ibab8cfa9129eac824a3d5fb9c3124ba807ba4245
---
 cc/config/global.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cc/config/global.go b/cc/config/global.go
index 4fcef9db6..357ea4437 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -290,11 +290,7 @@ var (
 		"-Wno-deprecated-non-prototype",
 	}
 
-	llvmNextExtraCommonGlobalCflags = []string{
-		"-Wno-error=array-parameter",     // http://b/241941550
-		"-Wno-error=deprecated-builtins", // http://b/241601211
-		"-Wno-error=deprecated",          // in external/googletest/googletest
-	}
+	llvmNextExtraCommonGlobalCflags = []string{}
 
 	IllegalFlags = []string{
 		"-w",