From 7202ffebf994136e2140e64fc0db7fab1d552a14 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 1 Jun 2023 15:28:54 +0100 Subject: [PATCH] Explicitly specify `--api-overloaded-method-order source` for metalava Previously, `--api-overloaded-method-order source` was the default if that option was not specified but the other change in this topic is switching it to `--api-overloaded-method-order signature` to match the behavior in AndroidX. This change explicitly specifies the option needed by Soong's use of metalava. Bug: 285140653 Test: m checkapi Change-Id: I00e049e0d991e650ab9940a3d495ed2b6e7480f8 --- java/droidstubs.go | 4 ++++ java/java.go | 4 ++++ 2 files changed, 8 insertions(+) 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 }