From f78531bb24112299bfac1fbc1385dc8b47cf61e2 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Wed, 9 Sep 2020 17:14:28 +0900
Subject: [PATCH] Don't emit make vars from disabled modules

Previously, disabled modules were able to emit make vars and this could
cause duplicated make var definitions when a prebuilt_build_tools is
enabled for both linux_glibc and linux_bionic.

Bug: 159685774
Test: m
Change-Id: I8570ae5aabb8199e7c3901921886bcfa849037fe
---
 android/makevars.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/makevars.go b/android/makevars.go
index 86f4b424b..003a9df32 100644
--- a/android/makevars.go
+++ b/android/makevars.go
@@ -234,7 +234,7 @@ func (s *makeVarsSingleton) GenerateBuildActions(ctx SingletonContext) {
 	}
 
 	ctx.VisitAllModules(func(m Module) {
-		if provider, ok := m.(ModuleMakeVarsProvider); ok {
+		if provider, ok := m.(ModuleMakeVarsProvider); ok && m.Enabled() {
 			mctx := &makeVarsContext{
 				SingletonContext: ctx,
 			}