summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Matt Gilbride <mattgilbride@google.com> 2022-11-21 17:38:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-11-21 17:38:21 +0000
commit0e2c2aaa60933b554802e786ce4ce75c89bd09a3 (patch)
tree76cc620075920197c02277af70c9868a18ed4c07 /java
parent6fcb32258af65501304020dd43dca2c02e10abb2 (diff)
parente17645fe304994ab999196c9dc3fb3dd9c6ab36a (diff)
Merge "lint: always run module specified in ANDROID_LINT_CHECK_EXTRA_MODULES"
Diffstat (limited to 'java')
-rw-r--r--java/lint.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/lint.go b/java/lint.go
index 9827159c8..7a6e5d9c1 100644
--- a/java/lint.go
+++ b/java/lint.go
@@ -190,10 +190,8 @@ func (l *linter) deps(ctx android.BottomUpMutatorContext) {
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(),