tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Support passing lint baseline to doclava" into main am: ddbfdb7f7e am: dc99bafb1d

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769206

Change-Id: Icaa3a09d152ae1e840df31401107b24a3686b0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Hansson 2023-10-04 16:43:54 +00:00 committed by Automerger Merge Worker
commit 88cf24b098
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
java/droiddoc.go
View file

@ -136,6 +136,9 @@ type DroiddocProperties struct {
// At some point, this might be improved to show more warnings.
Todo_file *string `android:"path"`
// A file containing a baseline for allowed lint errors.
Lint_baseline *string `android:"path"`
// directory under current module source that provide additional resources (images).
Resourcesdir *string
@ -665,6 +668,10 @@ func (d *Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd *android.Rule
ImplicitOutput(android.PathForModuleOut(ctx, String(d.properties.Todo_file)))
}
if String(d.properties.Lint_baseline) != "" {
cmd.FlagWithInput("-lintbaseline ", android.PathForModuleSrc(ctx, String(d.properties.Lint_baseline)))
}
if String(d.properties.Resourcesdir) != "" {
// TODO: should we add files under resourcesDir to the implicits? It seems that
// resourcesDir is one sub dir of htmlDir