diff --git a/java/droidstubs.go b/java/droidstubs.go index d577b22cc..151c94a43 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -539,6 +539,10 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi // See b/285140653 for more information. cmd.FlagWithArg("--api-class-resolution ", "api") + // Force metalava to sort overloaded methods by their order in the source code. + // See b/285312164 for more information. + cmd.FlagWithArg("--api-overloaded-method-order ", "source") + return cmd } diff --git a/java/java.go b/java/java.go index 5bc378b0c..09887a8af 100644 --- a/java/java.go +++ b/java/java.go @@ -1732,6 +1732,10 @@ func metalavaStubCmd(ctx android.ModuleContext, rule *android.RuleBuilder, // See b/285140653 for more information. cmd.FlagWithArg("--api-class-resolution ", "api") + // Force metalava to sort overloaded methods by their order in the source code. + // See b/285312164 for more information. + cmd.FlagWithArg("--api-overloaded-method-order ", "source") + return cmd }