Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b77c29e authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Use new merge-signatures metalava subcommand" into main am: 4ab9b3c2 am: aff61356 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2707495



Change-Id: Ibf1a5f0e748946a5d6531d16576a277ae121b80e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04c74853 aff61356

api/api.go

+2 −2
Original line number Diff line number Diff line
@@ -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{

		{