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

Merge changes from topic "replace_dependencies" into main am: 814e80038b

Browse Source 
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:
Colin Cross
2024-05-02 23:16:16 +00:00
committed by Automerger Merge Worker
parent 6e2dde355a 814e80038b
commit c5216a798a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/mutator.go
View File

@@ -594,11 +594,16 @@ func (a *androidTransitionMutator) IncomingTransition(bpctx blueprint.IncomingTr
func (a *androidTransitionMutator) Mutate(ctx blueprint.BottomUpMutatorContext, variation string) { func (a *androidTransitionMutator) Mutate(ctx blueprint.BottomUpMutatorContext, variation string) {
if am, ok := ctx.Module().(Module); ok { if am, ok := ctx.Module().(Module); ok {
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) mctx := bottomUpMutatorContextFactory(ctx, am, a.finalPhase)
defer bottomUpMutatorContextPool.Put(mctx) defer bottomUpMutatorContextPool.Put(mctx)
base := am.base()
base.commonProperties.DebugMutators = append(base.commonProperties.DebugMutators, a.name)
base.commonProperties.DebugVariations = append(base.commonProperties.DebugVariations, variation)
a.mutator.Mutate(mctx, variation) a.mutator.Mutate(mctx, variation)
} }
} }