diff options
Diffstat (limited to 'cc/tidy.go')
| -rw-r--r-- | cc/tidy.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/tidy.go b/cc/tidy.go index bbcaece24..ec1e8a206 100644 --- a/cc/tidy.go +++ b/cc/tidy.go @@ -68,7 +68,6 @@ func (tidy *tidyFeature) props() []interface{} { // Then, that old style usage will be obsolete and an error. const NoWarningsAsErrorsInTidyFlags = true -// keep this up to date with https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/cc/clang_tidy.bzl 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) @@ -201,7 +200,7 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags { } func init() { - android.RegisterSingletonType("tidy_phony_targets", TidyPhonySingleton) + android.RegisterParallelSingletonType("tidy_phony_targets", TidyPhonySingleton) } // This TidyPhonySingleton generates both tidy-* and obj-* phony targets for C/C++ files. @@ -221,7 +220,7 @@ func collectTidyObjModuleTargets(ctx android.SingletonContext, module android.Mo // (1) Collect all obj/tidy files into OS-specific groups. ctx.VisitAllModuleVariants(module, func(variant android.Module) { - if ctx.Config().KatiEnabled() && android.ShouldSkipAndroidMkProcessing(variant) { + if ctx.Config().KatiEnabled() && android.ShouldSkipAndroidMkProcessing(ctx, variant) { return } if m, ok := variant.(*Module); ok { |