summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Nan Zhang <nanzhang@google.com> 2018-08-15 13:28:54 -0700
committer Nan Zhang <nanzhang@google.com> 2018-08-20 13:28:41 -0700
commitd05a436e8b90ced82eef2ecdab05ee61c324d113 (patch)
tree2e35851b5c48c491b7d92e42cf7b5da1531e06ee /java
parent55e0bf42317822cf995ae973c172cc1d4db3090a (diff)
Append previous_api to "--migrate-nullness" option
"--previous-api" option was not recommended after Metalava was changed on how to consume the api file args. Test: m -j api-stubs-docs Bug: b/78245848 Change-Id: I1054173e11b4d47942dda0b95193277758aa8193
Diffstat (limited to 'java')
-rw-r--r--java/droiddoc.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go
index f90c548f5..104e46dcd 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -950,9 +950,8 @@ func (d *Droiddoc) collectMetalavaAnnotationsFlags(
previousApi := ctx.ExpandSource(String(d.properties.Metalava_previous_api),
"metalava_previous_api")
*implicits = append(*implicits, previousApi)
- flags += " --previous-api " + previousApi.String()
- flags += " --include-annotations --migrate-nullness"
+ flags += " --include-annotations --migrate-nullness " + previousApi.String()
d.annotationsZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"_annotations.zip")
*implicitOutputs = append(*implicitOutputs, d.annotationsZip)