| commit | cc79a6f514a89ac70336bd3d774f6857b6fc2e19 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 15 19:47:22 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 15 19:47:22 2020 +0000 |
| tree | 02c978ccb518618383cb191750a32728af8885c6 | |
| parent | 386821fae7f162c125a811c489171be23e3e80e0 [diff] | |
| parent | f78531bb24112299bfac1fbc1385dc8b47cf61e2 [diff] |
Merge "Don't emit make vars from disabled modules"
diff --git a/android/makevars.go b/android/makevars.go index 86f4b42..003a9df 100644 --- a/android/makevars.go +++ b/android/makevars.go
@@ -234,7 +234,7 @@ } ctx.VisitAllModules(func(m Module) { - if provider, ok := m.(ModuleMakeVarsProvider); ok { + if provider, ok := m.(ModuleMakeVarsProvider); ok && m.Enabled() { mctx := &makeVarsContext{ SingletonContext: ctx, }