Merge "Append previous_api to "--migrate-nullness" option"

am: 910fff22e6

Change-Id: I60504ef0f9cab576d947e59ad917c6154fecd00e
This commit is contained in:
Nan Zhang
2018-08-20 15:19:34 -07:00
committed by android-build-merger

View File

@@ -950,9 +950,8 @@ func (d *Droiddoc) collectMetalavaAnnotationsFlags(
previousApi := ctx.ExpandSource(String(d.properties.Metalava_previous_api), previousApi := ctx.ExpandSource(String(d.properties.Metalava_previous_api),
"metalava_previous_api") "metalava_previous_api")
*implicits = append(*implicits, previousApi) *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") d.annotationsZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"_annotations.zip")
*implicitOutputs = append(*implicitOutputs, d.annotationsZip) *implicitOutputs = append(*implicitOutputs, d.annotationsZip)