aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2023-10-10 17:50:25 +0100
committerCherrypicker Worker <android-build-cherrypicker-worker@google.com>2023-10-12 08:54:07 +0000
commit97bcce76952170374f0e054731750afb3d9984bc (patch)
tree4aa34ee2990cddc0fa8bef2fbe3528730ec3b077
parent3337dc79b9d6bee4e0594921f4036c5a22e79887 (diff)
downloadsoong-97bcce76952170374f0e054731750afb3d9984bc.tar.gz
Retain concrete overrides of abstract methods by default
Bug: 299366704 Test: m checkapi (cherry picked from https://android-review.googlesource.com/q/commit:629b9d287d61b44a587629c7c1176fcc2197590d) Merged-In: I3d9fafefe90a98568c16d80c30e4d1d88a22c350 Change-Id: I3d9fafefe90a98568c16d80c30e4d1d88a22c350
-rw-r--r--java/droidstubs.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go
index 521afd0bd..a9e20e03f 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -540,7 +540,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")
return cmd
}