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

Commit 8f9d0363 authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Retain concrete overrides of abstract methods by default" into main am: c5be9361 

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



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

java/droidstubs.go

+3 −1
Original line number Original line Diff line number Diff line
@@ -538,7 +538,9 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi 




	// Force metalava to sort overloaded methods by their order in the source code.

	// Force metalava to sort overloaded methods by their order in the source code.

	// See b/285312164 for more information.

	// See b/285312164 for more information.

	cmd.FlagWithArg("--format-defaults ", "overloaded-method-order=source")

	// And add concrete overrides of abstract methods, see b/299366704 for more

	// information.

	cmd.FlagWithArg("--format-defaults ", "overloaded-method-order=source,add-additional-overrides=yes")





	if ctx.DeviceConfig().HideFlaggedApis() {

	if ctx.DeviceConfig().HideFlaggedApis() {

		cmd.FlagWithArg("--hide-annotation ", "android.annotation.FlaggedApi")

		cmd.FlagWithArg("--hide-annotation ", "android.annotation.FlaggedApi")