commit 0e2c2aaa60933b554802e786ce4ce75c89bd09a3
author Matt Gilbride <mattgilbride@google.com> Mon Nov 21 17:38:21 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 21 17:38:21 2022 +0000
tree 76cc620075920197c02277af70c9868a18ed4c07
parent 6fcb32258af65501304020dd43dca2c02e10abb2
parent e17645fe304994ab999196c9dc3fb3dd9c6ab36a

Merge "lint: always run module specified in ANDROID_LINT_CHECK_EXTRA_MODULES"

java/lint.go

diff --git a/java/lint.go b/java/lint.go
index 9827159..7a6e5d9 100644
--- a/java/lint.go
+++ b/java/lint.go
@@ -190,10 +190,8 @@
 
 	extraCheckModules := l.properties.Lint.Extra_check_modules
 
-	if checkOnly := ctx.Config().Getenv("ANDROID_LINT_CHECK"); checkOnly != "" {
-		if checkOnlyModules := ctx.Config().Getenv("ANDROID_LINT_CHECK_EXTRA_MODULES"); checkOnlyModules != "" {
-			extraCheckModules = strings.Split(checkOnlyModules, ",")
-		}
+	if extraCheckModulesEnv := ctx.Config().Getenv("ANDROID_LINT_CHECK_EXTRA_MODULES"); extraCheckModulesEnv != "" {
+		extraCheckModules = append(extraCheckModules, strings.Split(extraCheckModulesEnv, ",")...)
 	}
 
 	ctx.AddFarVariationDependencies(ctx.Config().BuildOSCommonTarget.Variations(),