openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Nan Zhang 2018-08-15 13:28:54 -07:00
parent 55e0bf4231
commit d05a436e8b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/droiddoc.go
View File

@ -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)