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

This commit is contained in:
Jihoon Kang
2023-10-11 21:02:17 +00:00
committed by Gerrit Code Review

View File

@@ -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.
// 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() {
cmd.FlagWithArg("--hide-annotation ", "android.annotation.FlaggedApi")