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

Merge "Always check tidy properties"

Browse Source
This commit is contained in:
Treehugger Robot
2016-12-06 19:32:29 +00:00
committed by Gerrit Code Review
parent b278a58325 379d2cb511
commit 394cf47ac4
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/tidy.go
View File

@@ -49,6 +49,9 @@ func (tidy *tidyFeature) deps(ctx BaseModuleContext, deps Deps) Deps {
} }
func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags { func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags {
CheckBadTidyFlags(ctx, "tidy_flags", tidy.Properties.Tidy_flags)
CheckBadTidyChecks(ctx, "tidy_checks", tidy.Properties.Tidy_checks)
// Check if tidy is explicitly disabled for this module // Check if tidy is explicitly disabled for this module
if tidy.Properties.Tidy != nil && !*tidy.Properties.Tidy { if tidy.Properties.Tidy != nil && !*tidy.Properties.Tidy {
return flags return flags
@@ -66,8 +69,6 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags {
flags.Tidy = true flags.Tidy = true
CheckBadTidyFlags(ctx, "tidy_flags", tidy.Properties.Tidy_flags)
esc := proptools.NinjaAndShellEscape esc := proptools.NinjaAndShellEscape
flags.TidyFlags = append(flags.TidyFlags, esc(tidy.Properties.Tidy_flags)...) flags.TidyFlags = append(flags.TidyFlags, esc(tidy.Properties.Tidy_flags)...)
@@ -83,8 +84,6 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags {
tidyChecks += config.TidyChecksForDir(ctx.ModuleDir()) tidyChecks += config.TidyChecksForDir(ctx.ModuleDir())
} }
if len(tidy.Properties.Tidy_checks) > 0 { if len(tidy.Properties.Tidy_checks) > 0 {
CheckBadTidyChecks(ctx, "tidy_checks", tidy.Properties.Tidy_checks)
tidyChecks = tidyChecks + "," + strings.Join(esc(tidy.Properties.Tidy_checks), ",") tidyChecks = tidyChecks + "," + strings.Join(esc(tidy.Properties.Tidy_checks), ",")
} }
flags.TidyFlags = append(flags.TidyFlags, tidyChecks) flags.TidyFlags = append(flags.TidyFlags, tidyChecks)