aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-08-30 12:52:41 -0700
committerColin Cross <ccross@android.com>2018-08-30 19:54:37 +0000
commit6db4a6a7d9f046714c66dc9a29d1f486c5f53aa6 (patch)
tree35e5a769d84468389a3c7e36aa635fe190c2e05b /android
parent42d48b7b8b94e301d703656db0b25bc5ee7eb3bc (diff)
downloadbuild_soong-6db4a6a7d9f046714c66dc9a29d1f486c5f53aa6.tar.gz
build_soong-6db4a6a7d9f046714c66dc9a29d1f486c5f53aa6.tar.bz2
build_soong-6db4a6a7d9f046714c66dc9a29d1f486c5f53aa6.zip
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
Diffstat (limited to 'android')
-rw-r--r--android/mutator.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/mutator.go b/android/mutator.go
index 64d9fddb..b9c44e83 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)
}
}