diff options
Diffstat (limited to 'java/lint.go')
| -rw-r--r-- | java/lint.go | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/java/lint.go b/java/lint.go index 6ef109f97..931820d74 100644 --- a/java/lint.go +++ b/java/lint.go @@ -61,6 +61,11 @@ type LintProperties struct { // If true, baselining updatability lint checks (e.g. NewApi) is prohibited. Defaults to false. Strict_updatability_linting *bool + + // Treat the code in this module as test code for @VisibleForTesting enforcement. + // This will be true by default for test module types, false otherwise. + // If soong gets support for testonly, this flag should be replaced with that. + Test *bool } } @@ -74,7 +79,6 @@ type linter struct { classpath android.Paths classes android.Path extraLintCheckJars android.Paths - test bool library bool minSdkVersion int targetSdkVersion int @@ -210,7 +214,7 @@ func lintRBEExecStrategy(ctx android.ModuleContext) string { return ctx.Config().GetenvWithDefault("RBE_LINT_EXEC_STRATEGY", remoteexec.LocalExecStrategy) } -func (l *linter) writeLintProjectXML(ctx android.ModuleContext, rule *android.RuleBuilder) lintPaths { +func (l *linter) writeLintProjectXML(ctx android.ModuleContext, rule *android.RuleBuilder, srcsList android.Path) lintPaths { projectXMLPath := android.PathForModuleOut(ctx, "lint", "project.xml") // Lint looks for a lint.xml file next to the project.xml file, give it one. configXMLPath := android.PathForModuleOut(ctx, "lint", "lint.xml") @@ -229,7 +233,7 @@ func (l *linter) writeLintProjectXML(ctx android.ModuleContext, rule *android.Ru if l.library { cmd.Flag("--library") } - if l.test { + if proptools.BoolDefault(l.properties.Lint.Test, false) { cmd.Flag("--test") } if l.manifest != nil { @@ -241,8 +245,7 @@ func (l *linter) writeLintProjectXML(ctx android.ModuleContext, rule *android.Ru // TODO(ccross): some of the files in l.srcs are generated sources and should be passed to // lint separately. - srcsList := android.PathForModuleOut(ctx, "lint-srcs.list") - cmd.FlagWithRspFileInputList("--srcs ", srcsList, l.srcs) + cmd.FlagWithInput("--srcs ", srcsList) cmd.FlagWithInput("--generated_srcs ", srcJarList) @@ -387,7 +390,11 @@ func (l *linter) lint(ctx android.ModuleContext) { rule.Temporary(manifest) } - lintPaths := l.writeLintProjectXML(ctx, rule) + srcsList := android.PathForModuleOut(ctx, "lint", "lint-srcs.list") + srcsListRsp := android.PathForModuleOut(ctx, "lint-srcs.list.rsp") + rule.Command().Text("cp").FlagWithRspFileInputList("", srcsListRsp, l.srcs).Output(srcsList) + + lintPaths := l.writeLintProjectXML(ctx, rule, srcsList) html := android.PathForModuleOut(ctx, "lint", "lint-report.html") text := android.PathForModuleOut(ctx, "lint", "lint-report.txt") @@ -447,6 +454,7 @@ func (l *linter) lint(ctx android.ModuleContext) { FlagWithArg("--kotlin-language-level ", l.kotlinLanguageLevel). FlagWithArg("--url ", fmt.Sprintf(".=.,%s=out", android.PathForOutput(ctx).String())). Flag("--exitcode"). + Flag("--apply-suggestions"). // applies suggested fixes to files in the sandbox Flags(l.properties.Lint.Flags). Implicit(annotationsZipPath). Implicit(apiVersionsXMLPath) @@ -472,6 +480,13 @@ func (l *linter) lint(ctx android.ModuleContext) { // The HTML output contains a date, remove it to make the output deterministic. rule.Command().Text(`sed -i.tmp -e 's|Check performed at .*\(</nav>\)|\1|'`).Output(html) + // The sources in the sandbox may have been modified by --apply-suggestions, zip them up and + // export them out of the sandbox. + rule.Command().BuiltTool("soong_zip"). + FlagWithOutput("-o ", android.PathForModuleOut(ctx, "lint", "suggested-fixes.zip")). + FlagWithArg("-C ", cmd.PathForInput(android.PathForSource(ctx))). + FlagWithInput("-r ", srcsList) + rule.Build("lint", "lint") l.outputs = lintOutputs{ |