From f3b1fc4e1acbc238ebb1891066df6ae688e15180 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 14 Aug 2023 22:03:06 +0100 Subject: Use new merge-signatures metalava subcommand Bug: 295737759 Test: ./gradlew Change-Id: Ied167094b04492ca49ea2b0e9d7fd91d534e483d --- api/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'api/api.go') diff --git a/api/api.go b/api/api.go index c568a45de5d0..27556912d612 100644 --- a/api/api.go +++ b/api/api.go @@ -145,7 +145,7 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) { metalavaCmd := "$(location metalava)" // Silence reflection warnings. See b/168689341 metalavaCmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED " - metalavaCmd += " --quiet --no-banner --format=v2 " + metalavaCmd += " --quiet merge-signatures --format=v2 " filename := txt.TxtFilename if txt.Scope != "public" { @@ -155,7 +155,7 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) { props.Name = proptools.StringPtr(ctx.ModuleName() + "-" + filename) props.Tools = []string{"metalava"} props.Out = []string{filename} - props.Cmd = proptools.StringPtr(metalavaCmd + "$(in) --api $(out)") + props.Cmd = proptools.StringPtr(metalavaCmd + "$(in) --out $(out)") props.Srcs = append([]string{txt.BaseTxt}, createSrcs(txt.Modules, txt.ModuleTag)...) props.Dists = []android.Dist{ { -- cgit v1.2.3-59-g8ed1b