diff options
| author | Colin Cross <ccross@android.com> | 2016-12-06 19:37:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 19:37:54 +0000 |
| commit | 8cc1cb68cd334076948eb1208dc1818de9a61915 (patch) | |
| tree | 311e7af5d3a5bd5f5307785dedadb9d3ee5d559f | |
| parent | 5eb63150227545975f809fcc36d0ce7113769867 (diff) | |
| parent | 394cf47ac4e51ef56935eed19e91618a6b0b7fe7 (diff) | |
| download | build_soong-8cc1cb68cd334076948eb1208dc1818de9a61915.tar.gz build_soong-8cc1cb68cd334076948eb1208dc1818de9a61915.tar.bz2 build_soong-8cc1cb68cd334076948eb1208dc1818de9a61915.zip | |
Merge "Always check tidy properties"
am: 394cf47ac4
Change-Id: Ibdcf53abc01ec0533932059b2e5070fd5d9f1139
| -rw-r--r-- | cc/tidy.go | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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) |