Merge "Remove metalava --no-banner argument" into main

This commit is contained in:
Treehugger Robot
2023-07-12 17:08:42 +00:00
committed by Gerrit Code Review
3 changed files with 2 additions and 5 deletions

View File

@@ -525,8 +525,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
cmd.FlagWithInputList("-classpath ", classpath.Paths(), ":") cmd.FlagWithInputList("-classpath ", classpath.Paths(), ":")
} }
cmd.Flag("--no-banner"). cmd.Flag("--color").
Flag("--color").
Flag("--quiet"). Flag("--quiet").
Flag("--format=v2"). Flag("--format=v2").
FlagWithArg("--repeat-errors-max ", "10"). FlagWithArg("--repeat-errors-max ", "10").

View File

@@ -1236,7 +1236,6 @@ func buildRuleToGenerateRemovedDexSignatures(ctx android.ModuleContext, suffix s
rule := android.NewRuleBuilder(pctx, ctx) rule := android.NewRuleBuilder(pctx, ctx)
rule.Command(). rule.Command().
BuiltTool("metalava"). BuiltTool("metalava").
Flag("--no-banner").
Inputs(removedTxtFiles). Inputs(removedTxtFiles).
FlagWithOutput("--dex-api ", output) FlagWithOutput("--dex-api ", output)
rule.Build("modular-hiddenapi-removed-dex-signatures"+suffix, "modular hiddenapi removed dex signatures"+suffix) rule.Build("modular-hiddenapi-removed-dex-signatures"+suffix, "modular hiddenapi removed dex signatures"+suffix)

View File

@@ -1716,8 +1716,7 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder,
FlagWithArg("-encoding ", "UTF-8"). FlagWithArg("-encoding ", "UTF-8").
FlagWithInputList("--source-files ", srcs, " ") FlagWithInputList("--source-files ", srcs, " ")
cmd.Flag("--no-banner"). cmd.Flag("--color").
Flag("--color").
Flag("--quiet"). Flag("--quiet").
Flag("--format=v2"). Flag("--format=v2").
Flag("--include-annotations"). Flag("--include-annotations").