StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "no out/soong/... in default header-filter" am: c275b81fc7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092485

Change-Id: Id3731511b39d957f597dc1c6ddb5580ba19a39d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chih-hung Hsieh
2022-05-11 20:39:48 +00:00
committed by Automerger Merge Worker
parent 63c05717b3 c275b81fc7
commit 302ce27825
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/tidy.go
View File

@@ -96,10 +96,15 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags {
if !android.SubstringInList(flags.TidyFlags, "-header-filter=") { if !android.SubstringInList(flags.TidyFlags, "-header-filter=") {
defaultDirs := ctx.Config().Getenv("DEFAULT_TIDY_HEADER_DIRS") defaultDirs := ctx.Config().Getenv("DEFAULT_TIDY_HEADER_DIRS")
headerFilter := "-header-filter=" headerFilter := "-header-filter="
// Default header filter should include only the module directory,
// not the out/soong/.../ModuleDir/...
// Otherwise, there will be too many warnings from generated files in out/...
// If a module wants to see warnings in the generated source files,
// it should specify its own -header-filter flag.
if defaultDirs == "" { if defaultDirs == "" {
headerFilter += ctx.ModuleDir() + "/" headerFilter += "^" + ctx.ModuleDir() + "/"
} else { } else {
headerFilter += "\"(" + ctx.ModuleDir() + "/|" + defaultDirs + ")\"" headerFilter += "\"(^" + ctx.ModuleDir() + "/|" + defaultDirs + ")\""
} }
flags.TidyFlags = append(flags.TidyFlags, headerFilter) flags.TidyFlags = append(flags.TidyFlags, headerFilter)
} }