Merge changes from topic "replace_dependencies" into main am: 814e80038b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070706 Change-Id: I559771ff5278db17095967f8bd582bb0fa906413 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -594,11 +594,16 @@ func (a *androidTransitionMutator) IncomingTransition(bpctx blueprint.IncomingTr
|
||||
|
||||
func (a *androidTransitionMutator) Mutate(ctx blueprint.BottomUpMutatorContext, variation string) {
|
||||
if am, ok := ctx.Module().(Module); ok {
|
||||
mctx := bottomUpMutatorContextFactory(ctx, am, a.finalPhase)
|
||||
defer bottomUpMutatorContextPool.Put(mctx)
|
||||
if variation != "" {
|
||||
// TODO: this should really be checking whether the TransitionMutator affected this module, not
|
||||
// the empty variant, but TransitionMutator has no concept of skipping a module.
|
||||
base := am.base()
|
||||
base.commonProperties.DebugMutators = append(base.commonProperties.DebugMutators, a.name)
|
||||
base.commonProperties.DebugVariations = append(base.commonProperties.DebugVariations, variation)
|
||||
}
|
||||
|
||||
mctx := bottomUpMutatorContextFactory(ctx, am, a.finalPhase)
|
||||
defer bottomUpMutatorContextPool.Put(mctx)
|
||||
a.mutator.Mutate(mctx, variation)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user