From bd2624442b587b1b1e0ea36aa6c0623710bb00fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Wed, 12 Jul 2023 14:01:49 +0200 Subject: [PATCH] Remove metalava --no-banner argument metalava no longer prints an ASCII banner, and has removed its --no-banner argument. Update all call sites accordingly. Test: presubmit Bug: 286023667 Change-Id: I61cf5f1125dfbd93496e6a59eb1ea62886b32046 --- java/droidstubs.go | 3 +-- java/hiddenapi_modular.go | 1 - java/java.go | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/java/droidstubs.go b/java/droidstubs.go index 151c94a43..bb2388f96 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -525,8 +525,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi cmd.FlagWithInputList("-classpath ", classpath.Paths(), ":") } - cmd.Flag("--no-banner"). - Flag("--color"). + cmd.Flag("--color"). Flag("--quiet"). Flag("--format=v2"). FlagWithArg("--repeat-errors-max ", "10"). diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index c6b921bb2..f31f5d1a8 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -1236,7 +1236,6 @@ func buildRuleToGenerateRemovedDexSignatures(ctx android.ModuleContext, suffix s rule := android.NewRuleBuilder(pctx, ctx) rule.Command(). BuiltTool("metalava"). - Flag("--no-banner"). Inputs(removedTxtFiles). FlagWithOutput("--dex-api ", output) rule.Build("modular-hiddenapi-removed-dex-signatures"+suffix, "modular hiddenapi removed dex signatures"+suffix) diff --git a/java/java.go b/java/java.go index 50d48ab6d..389cdcede 100644 --- a/java/java.go +++ b/java/java.go @@ -1716,8 +1716,7 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder, FlagWithArg("-encoding ", "UTF-8"). FlagWithInputList("--source-files ", srcs, " ") - cmd.Flag("--no-banner"). - Flag("--color"). + cmd.Flag("--color"). Flag("--quiet"). Flag("--format=v2"). Flag("--include-annotations").