StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add support for nullability validation to droidstubs."

Browse Source
This commit is contained in:
Pete Gillin
2018-10-29 11:46:13 +00:00
committed by Gerrit Code Review
parent 63c6361f91 a262c05904
commit 67df651c3a
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
java/droiddoc.go
View File

@@ -1390,15 +1390,23 @@ func (d *Droidstubs) collectAnnotationsFlags(ctx android.ModuleContext,
implicits *android.Paths, implicitOutputs *android.WritablePaths) string { implicits *android.Paths, implicitOutputs *android.WritablePaths) string {
var flags string var flags string
if Bool(d.properties.Annotations_enabled) { if Bool(d.properties.Annotations_enabled) {
if String(d.properties.Previous_api) == "" { flags += " --include-annotations"
ctx.PropertyErrorf("metalava_previous_api", validatingNullability := strings.Contains(d.Javadoc.args, "--validate-nullability-from-merged-stubs")
"has to be non-empty if annotations was enabled!") migratingNullability := String(d.properties.Previous_api) != ""
if !(migratingNullability || validatingNullability) {
ctx.PropertyErrorf("previous_api",
"has to be non-empty if annotations was enabled (unless validating nullability)")
}
if migratingNullability {
previousApi := ctx.ExpandSource(String(d.properties.Previous_api), "previous_api")
*implicits = append(*implicits, previousApi)
flags += " --migrate-nullness " + previousApi.String()
}
if validatingNullability {
nullabilityWarningsTxt := android.PathForModuleOut(ctx, ctx.ModuleName()+"_nullability_warnings.txt")
*implicitOutputs = append(*implicitOutputs, nullabilityWarningsTxt)
flags += " --nullability-warnings-txt " + nullabilityWarningsTxt.String()
} }
previousApi := ctx.ExpandSource(String(d.properties.Previous_api),
"metalava_previous_api")
*implicits = append(*implicits, previousApi)
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)