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

Commit 41ce7e62 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Pass the current API file to the metalava --use-same-format-as option"... 

Merge "Pass the current API file to the metalava --use-same-format-as option" into main am: 64876012

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706154



Change-Id: I17e9f724b77338360b1e47370de0a089e41cc77f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a823f9da 64876012

java/droidstubs.go

+7 −0
Original line number Diff line number Diff line
@@ -694,6 +694,13 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		cmd.FlagWithArg("--error-message:compatibility:released ", msg)

	}



	if apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") {

		// Pass the current API file into metalava so it can use it as the basis for determining how to

		// generate the output signature files (both api and removed).

		currentApiFile := android.PathForModuleSrc(ctx, String(d.properties.Check_api.Current.Api_file))

		cmd.FlagWithInput("--use-same-format-as ", currentApiFile)

	}



	if generateStubs {

		rule.Command().

			BuiltTool("soong_zip").