tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Always check tidy properties"

Browse source 
am: 394cf47ac4

Change-Id: Ibdcf53abc01ec0533932059b2e5070fd5d9f1139
This commit is contained in:
Colin Cross 2016-12-06 19:37:54 +00:00 committed by android-build-merger
commit 8cc1cb68cd
1 changed files with 3 additions and 4 deletions
Show stats 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 {
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
if tidy.Properties.Tidy != nil && !*tidy.Properties.Tidy {
return flags
@ -66,8 +69,6 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags {
flags.Tidy = true
CheckBadTidyFlags(ctx, "tidy_flags", tidy.Properties.Tidy_flags)
esc := proptools.NinjaAndShellEscape
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())
}
if len(tidy.Properties.Tidy_checks) > 0 {
CheckBadTidyChecks(ctx, "tidy_checks", tidy.Properties.Tidy_checks)
tidyChecks = tidyChecks + "," + strings.Join(esc(tidy.Properties.Tidy_checks), ",")
}
flags.TidyFlags = append(flags.TidyFlags, tidyChecks)