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

Merge "Retain concrete overrides of abstract methods by default" into main am: c5be9361b6 am: 8f9d036314 am: cc599888db am: e7aea53468

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781328

Change-Id: Ic057ea5add8a531977182f5d2d68164e7b75b6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jihoon Kang
2023-10-11 22:32:32 +00:00
committed by Automerger Merge Worker
parent c1d2293205 e7aea53468
commit 9dcf9c0655
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/droidstubs.go
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")