summaryrefslogtreecommitdiff
path: root/api/api.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2023-08-14 22:03:06 +0100
committer Paul Duffin <paulduffin@google.com> 2023-08-14 22:03:06 +0100
commitf3b1fc4e1acbc238ebb1891066df6ae688e15180 (patch)
tree753f40c0d50dd6357cd8363213d6ba23582e8197 /api/api.go
parenta6fac5d6c7c5ad05094c315812cc53a07729d82c (diff)
Use new merge-signatures metalava subcommand
Bug: 295737759 Test: ./gradlew Change-Id: Ied167094b04492ca49ea2b0e9d7fd91d534e483d
Diffstat (limited to 'api/api.go')
-rw-r--r--api/api.go4
1 files changed, 2 insertions, 2 deletions
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{
{