openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Skip DepsMutator on disabled modules" 

am: 418d261481

Change-Id: Id3f90a67abae7483b1b0697790854aff0a8d5bda
This commit is contained in:
Colin Cross 2018-08-30 16:21:52 -07:00 committed by android-build-merger
parent ecdcb62d22 418d261481
commit 2ddd61f238
2 changed files with 1 additions and 5 deletions
Show Stats 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) {
if m, ok := ctx.Module().(Module); ok {
if m, ok := ctx.Module().(Module); ok && m.Enabled() {
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) {
if !c.Enabled() {
return
}
ctx := &depsContext{
BottomUpMutatorContext: actx,
moduleContextImpl: moduleContextImpl{