StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly specify --api-overloaded-method-order source for metalava

Browse Source 
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 7202ffebf9)
This commit is contained in:
Paul Duffin
2023-06-01 15:28:54 +01:00
parent d7d52fa7cc
commit 2ba521e408
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/droidstubs.go
View File

@@ -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
}

4
java/java.go
View File

@@ -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
}