From 2ba521e408f58c9e92e4af1c8cfb63afe3e1d2f9 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 1 Jun 2023 15:28:54 +0100 Subject: 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: 294300564 Bug: 285140653 Test: m checkapi Merged-In: I00e049e0d991e650ab9940a3d495ed2b6e7480f8 Change-Id: I00e049e0d991e650ab9940a3d495ed2b6e7480f8 (cherry picked from commit 7202ffebf994136e2140e64fc0db7fab1d552a14) --- java/java.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index dec7810e8..75c0a5c4b 100644 --- a/java/java.go +++ b/java/java.go @@ -1727,6 +1727,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 } -- cgit v1.2.3-59-g8ed1b