diff options
| author | 2023-08-15 11:01:09 +0000 | |
|---|---|---|
| committer | 2023-08-15 11:01:09 +0000 | |
| commit | 4ab9b3c2a1dfd2216982aedcbd7dad84cda2d256 (patch) | |
| tree | b7d5c9fa3e2602c3d6cc5ba1ad6884beb0735bc4 /api/api.go | |
| parent | 5dd28ee157926e3667682097d3a9a19172e2dd67 (diff) | |
| parent | f3b1fc4e1acbc238ebb1891066df6ae688e15180 (diff) | |
Merge "Use new merge-signatures metalava subcommand" into main
Diffstat (limited to 'api/api.go')
| -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{ { |