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

Merge "Add SOONG_DISABLE_CLIPPY environment variable" into main am: 24627096c1

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

Change-Id: Ic5e3829598b7f0a6ade7a9b9371dee804395098a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-13 06:12:47 +00:00
committed by Automerger Merge Worker
parent c178376639 24627096c1
commit 909dcb45ed
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rust/clippy.go
View File

@@ -38,11 +38,14 @@ func (c *clippy) props() []interface{} {
} }
func (c *clippy) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags, PathDeps) { func (c *clippy) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags, PathDeps) {
enabled, lints, err := config.ClippyLintsForDir(ctx.ModuleDir(), c.Properties.Clippy_lints) dirEnabled, lints, err := config.ClippyLintsForDir(ctx.ModuleDir(), c.Properties.Clippy_lints)
if err != nil { if err != nil {
ctx.PropertyErrorf("clippy_lints", err.Error()) ctx.PropertyErrorf("clippy_lints", err.Error())
} }
flags.Clippy = enabled
envDisable := ctx.Config().IsEnvTrue("SOONG_DISABLE_CLIPPY")
flags.Clippy = dirEnabled && !envDisable
flags.ClippyFlags = append(flags.ClippyFlags, lints) flags.ClippyFlags = append(flags.ClippyFlags, lints)
return flags, deps return flags, deps
} }