From 6c771e7d299ef93173a67ff39c83244ab04775bb Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Tue, 21 Nov 2023 19:51:07 +0000 Subject: [PATCH] Revert "Remove flags rejected by RBE input processor" This reverts commit a4724a0c4e3cbbc22d47f3581d445e6d9cb217ad. Reason for revert: reclient has an updated deps scanner now. Bug: http://b/248371171 Test: enable RBE; RBE_CLANG_TIDY_EXEC_STRATEGY=remote; make tidy-soong_subset (cherry picked from https://android-review.googlesource.com/q/commit:2c36e5efceae94424b513878cf6dc4e9640651ab) Merged-In: Id876bd7eee1e5606f8dc05903f77f135b47da360 Change-Id: Id876bd7eee1e5606f8dc05903f77f135b47da360 --- cc/builder.go | 7 +------ cc/config/tidy.go | 9 --------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/cc/builder.go b/cc/builder.go index 3f582fa85..69cf75bdd 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -681,16 +681,11 @@ func transformSourceToObj(ctx ModuleContext, subdir string, srcFiles, noTidySrcs tidyCmd := "${config.ClangBin}/clang-tidy" rule := clangTidy - reducedCFlags := moduleFlags if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CLANG_TIDY") { rule = clangTidyRE - // b/248371171, work around RBE input processor problem - // some cflags rejected by input processor, but usually - // do not affect included files or clang-tidy - reducedCFlags = config.TidyReduceCFlags(reducedCFlags) } - sharedCFlags := shareFlags("cFlags", reducedCFlags) + sharedCFlags := shareFlags("cFlags", moduleFlags) srcRelPath := srcFile.Rel() // Add the .tidy rule diff --git a/cc/config/tidy.go b/cc/config/tidy.go index efa45495b..b40557a29 100644 --- a/cc/config/tidy.go +++ b/cc/config/tidy.go @@ -16,7 +16,6 @@ package config import ( "android/soong/android" - "regexp" "strings" ) @@ -281,11 +280,3 @@ func TidyFlagsForSrcFile(srcFile android.Path, flags string) string { } return flags } - -var ( - removedCFlags = regexp.MustCompile(" -fsanitize=[^ ]*memtag-[^ ]* ") -) - -func TidyReduceCFlags(flags string) string { - return removedCFlags.ReplaceAllString(flags, " ") -}