Merge "Zip lint reference baselines" (831e50f4) · Commits · e / os / android_build_soong

java/lint.go

+19 −13

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ type lintOutputs struct {
		html android.Path
		text android.Path
		xml android.Path
		referenceBaseline android.Path

		depSets LintDepSets
		}
		@@ -450,7 +451,7 @@ func (l *linter) lint(ctx android.ModuleContext) {
		html := android.PathForModuleOut(ctx, "lint", "lint-report.html")
		text := android.PathForModuleOut(ctx, "lint", "lint-report.txt")
		xml := android.PathForModuleOut(ctx, "lint", "lint-report.xml")
		baseline := android.PathForModuleOut(ctx, "lint", "lint-baseline.xml")
		referenceBaseline := android.PathForModuleOut(ctx, "lint", "lint-baseline.xml")

		depSetsBuilder := NewLintDepSetBuilder().Direct(html, text, xml)

		@@ -513,7 +514,7 @@ func (l *linter) lint(ctx android.ModuleContext) {
		cmd.FlagWithInput("--baseline ", lintBaseline.Path())
		}

		cmd.FlagWithOutput("--write-reference-baseline ", baseline)
		cmd.FlagWithOutput("--write-reference-baseline ", referenceBaseline)

		cmd.Text("; EXITCODE=$?; ")

		@@ -538,6 +539,7 @@ func (l *linter) lint(ctx android.ModuleContext) {
		html: html,
		text: text,
		xml: xml,
		referenceBaseline: referenceBaseline,

		depSets: depSetsBuilder.Build(),
		}
		@@ -572,6 +574,7 @@ type lintSingleton struct {
		htmlZip android.WritablePath
		textZip android.WritablePath
		xmlZip android.WritablePath
		referenceBaselineZip android.WritablePath
		}

		func (l *lintSingleton) GenerateBuildActions(ctx android.SingletonContext) {
		@@ -684,12 +687,15 @@ func (l *lintSingleton) generateLintReportZips(ctx android.SingletonContext) {
		l.xmlZip = android.PathForOutput(ctx, "lint-report-xml.zip")
		zip(l.xmlZip, func(l *lintOutputs) android.Path { return l.xml })

		ctx.Phony("lint-check", l.htmlZip, l.textZip, l.xmlZip)
		l.referenceBaselineZip = android.PathForOutput(ctx, "lint-report-reference-baselines.zip")
		zip(l.referenceBaselineZip, func(l *lintOutputs) android.Path { return l.referenceBaseline })

		ctx.Phony("lint-check", l.htmlZip, l.textZip, l.xmlZip, l.referenceBaselineZip)
		}

		func (l *lintSingleton) MakeVars(ctx android.MakeVarsContext) {
		if !ctx.Config().UnbundledBuild() {
		ctx.DistForGoal("lint-check", l.htmlZip, l.textZip, l.xmlZip)
		ctx.DistForGoal("lint-check", l.htmlZip, l.textZip, l.xmlZip, l.referenceBaselineZip)
		}
		}