StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip DepsMutator on disabled modules"

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-30 22:56:32 +00:00
committed by Gerrit Code Review
parent 191f646295 6db4a6a7d9
commit 418d261481
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/mutator.go
View File

@@ -205,7 +205,7 @@ func (mutator *mutator) Parallel() MutatorHandle {
} }
func depsMutator(ctx BottomUpMutatorContext) { func depsMutator(ctx BottomUpMutatorContext) {
if m, ok := ctx.Module().(Module); ok { if m, ok := ctx.Module().(Module); ok && m.Enabled() {
m.DepsMutator(ctx) m.DepsMutator(ctx)
} }
} }

4
cc/cc.go
View File

@@ -922,10 +922,6 @@ func (c *Module) beginMutator(actx android.BottomUpMutatorContext) {
} }
func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
if !c.Enabled() {
return
}
ctx := &depsContext{ ctx := &depsContext{
BottomUpMutatorContext: actx, BottomUpMutatorContext: actx,
moduleContextImpl: moduleContextImpl{ moduleContextImpl: moduleContextImpl{