Merge "Introduce NewApi lint checks" (53d69eb0) · Commits · e / os / android_build_soong

java/java_test.go

+8 −0

Original line number	Diff line number	Diff line
		@@ -1261,6 +1261,14 @@ func TestJavaLintUsesCorrectBpConfig(t *testing.T) {
		if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline mybaseline.xml") {
		t.Error("did not use the correct file for baseline")
		}

		if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check NewApi") {
		t.Error("should check NewApi errors")
		}

		if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check SomeCheck") {
		t.Error("should combine NewApi errors with SomeCheck errors")
		}
		}

		func TestGeneratedSources(t *testing.T) {

+24 −18

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ type linter struct {
		kotlinLanguageLevel string
		outputs lintOutputs
		properties LintProperties
		extraMainlineLintErrors []string

		reports android.Paths

		@@ -246,6 +247,7 @@ func (l linter) writeLintProjectXML(ctx android.ModuleContext, rule android.Ru
		cmd.FlagWithInput("@",
		android.PathForSource(ctx, "build/soong/java/lint_defaults.txt"))

		cmd.FlagForEachArg("--error_check ", l.extraMainlineLintErrors)
		cmd.FlagForEachArg("--disable_check ", l.properties.Lint.Disabled_checks)
		cmd.FlagForEachArg("--warning_check ", l.properties.Lint.Warning_checks)
		cmd.FlagForEachArg("--error_check ", l.properties.Lint.Error_checks)
		@@ -282,6 +284,10 @@ func (l *linter) lint(ctx android.ModuleContext) {
		return
		}

		if l.minSdkVersion != l.compileSdkVersion {
		l.extraMainlineLintErrors = append(l.extraMainlineLintErrors, "NewApi")
		}

		extraLintCheckModules := ctx.GetDirectDepsWithTag(extraLintCheckTag)
		for _, extraLintCheckModule := range extraLintCheckModules {
		if ctx.OtherModuleHasProvider(extraLintCheckModule, JavaInfoProvider) {