diff options
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 9dadb30e5..9cde18987 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -360,6 +360,9 @@ type DroidstubsProperties struct { // a list of top-level directories containing Java stub files to merge show/hide annotations from. Merge_inclusion_annotations_dirs []string + // a file containing a list of classes to do nullability validation for. + Validate_nullability_from_list *string + // a file containing expected warnings produced by validation of nullability annotations. Check_nullability_warnings *string @@ -1126,9 +1129,9 @@ func (d *Droiddoc) transformDokka(ctx android.ModuleContext, implicits android.P Inputs: d.Javadoc.srcFiles, Implicits: implicits, Args: map[string]string{ - "outDir": android.PathForModuleOut(ctx, "out").String(), - "srcJarDir": android.PathForModuleOut(ctx, "srcjars").String(), - "stubsDir": android.PathForModuleOut(ctx, "stubsDir").String(), + "outDir": android.PathForModuleOut(ctx, "dokka-out").String(), + "srcJarDir": android.PathForModuleOut(ctx, "dokka-srcjars").String(), + "stubsDir": android.PathForModuleOut(ctx, "dokka-stubsDir").String(), "srcJars": strings.Join(d.Javadoc.srcJars.Strings(), " "), "classpathArgs": classpathArgs, "opts": opts, @@ -1302,6 +1305,9 @@ func (d *Droidstubs) DepsMutator(ctx android.BottomUpMutatorContext) { } } + if String(d.properties.Validate_nullability_from_list) != "" { + android.ExtractSourceDeps(ctx, d.properties.Validate_nullability_from_list) + } if String(d.properties.Check_nullability_warnings) != "" { android.ExtractSourceDeps(ctx, d.properties.Check_nullability_warnings) } @@ -1411,7 +1417,9 @@ func (d *Droidstubs) collectAnnotationsFlags(ctx android.ModuleContext, var flags string if Bool(d.properties.Annotations_enabled) { flags += " --include-annotations" - validatingNullability := strings.Contains(d.Javadoc.args, "--validate-nullability-from-merged-stubs") + validatingNullability := + strings.Contains(d.Javadoc.args, "--validate-nullability-from-merged-stubs") || + String(d.properties.Validate_nullability_from_list) != "" migratingNullability := String(d.properties.Previous_api) != "" if !(migratingNullability || validatingNullability) { ctx.PropertyErrorf("previous_api", @@ -1422,6 +1430,9 @@ func (d *Droidstubs) collectAnnotationsFlags(ctx android.ModuleContext, *implicits = append(*implicits, previousApi) flags += " --migrate-nullness " + previousApi.String() } + if s := String(d.properties.Validate_nullability_from_list); s != "" { + flags += " --validate-nullability-from-list " + ctx.ExpandSource(s, "validate_nullability_from_list").String() + } if validatingNullability { d.nullabilityWarningsFile = android.PathForModuleOut(ctx, ctx.ModuleName()+"_nullability_warnings.txt") *implicitOutputs = append(*implicitOutputs, d.nullabilityWarningsFile) @@ -1574,7 +1585,7 @@ func (d *Droidstubs) transformCheckApi(ctx android.ModuleContext, Implicits: append(android.Paths{apiFile, removedApiFile, d.apiFile, d.removedApiFile}, implicits...), Args: map[string]string{ - "srcJarDir": android.PathForModuleOut(ctx, "srcjars").String(), + "srcJarDir": android.PathForModuleOut(ctx, "apicheck-srcjars").String(), "srcJars": strings.Join(d.Javadoc.srcJars.Strings(), " "), "javaVersion": javaVersion, "bootclasspathArgs": bootclasspathArgs, |