commit 06e36c737f293534dc9a72e4af9157387111467d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 20 22:21:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 20 22:21:32 2018 +0000
tree f0de5fe39d0467274d9326bff2401b367817a25d
parent 910fff22e638921a28f5e0991f28f7ae62396ede
parent b98c0f4c7dd75867544fd8f31c6ed510e65140a1

Merge "Fix using defaults in android_app and android_test modules"

java/droiddoc.go

diff --git a/java/droiddoc.go b/java/droiddoc.go
index f90c548..104e46d 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -950,9 +950,8 @@
 		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)