diff options
| author | 2023-08-15 15:50:58 +0000 | |
|---|---|---|
| committer | 2023-08-15 15:50:58 +0000 | |
| commit | e99994ed2870158b204c57c60206d889d5f7d352 (patch) | |
| tree | 9bbce06ab2a6fdee34bbe746e5d0704fed50307e | |
| parent | c84c7053025776d4895cc93e59f307e41c0e641d (diff) | |
| parent | ae2f6671ece100f79f4cd93d5b471761a5b01522 (diff) | |
Merge "Use new merge-signatures metalava subcommand" into main am: 4ab9b3c2a1 am: aff61356f9 am: 1b77c29e16 am: b22b3c9d48 am: ae2f6671ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2707495
Change-Id: I362f29a3d8462b2280c9c30888ec7545cf6cc878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | api/api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/api.go b/api/api.go index a003aba2707a..e09be03cd51d 100644 --- a/api/api.go +++ b/api/api.go @@ -146,7 +146,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" { @@ -156,7 +156,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{ { |