From 6db4a6a7d9f046714c66dc9a29d1f486c5f53aa6 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 30 Aug 2018 12:52:41 -0700
Subject: [PATCH] Skip DepsMutator on disabled modules

Dependencies of disabled modules may not have the right variations
for calling AddVariationDependencies, skip DepsMutator completely
on disabled modules.

Bug: 112707915
Test: m checkbuild
Test: prebuilts/build-tools/build-prebuilts.sh
Change-Id: I702e591437e5e6eb9f91f3b7eb32bacc4bd5d249
---
 android/mutator.go | 2 +-
 cc/cc.go           | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/android/mutator.go b/android/mutator.go
index 64d9fddb7..b9c44e83a 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -205,7 +205,7 @@ func (mutator *mutator) Parallel() MutatorHandle {
 }
 
 func depsMutator(ctx BottomUpMutatorContext) {
-	if m, ok := ctx.Module().(Module); ok {
+	if m, ok := ctx.Module().(Module); ok && m.Enabled() {
 		m.DepsMutator(ctx)
 	}
 }
diff --git a/cc/cc.go b/cc/cc.go
index befd68331..44d5900f9 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -922,10 +922,6 @@ func (c *Module) beginMutator(actx android.BottomUpMutatorContext) {
 }
 
 func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
-	if !c.Enabled() {
-		return
-	}
-
 	ctx := &depsContext{
 		BottomUpMutatorContext: actx,
 		moduleContextImpl: moduleContextImpl{