Merge "apexDepsMutator is now bottom-up mutator"

This commit is contained in:
Treehugger Robot 2019-11-15 05:18:24 +00:00 committed by Gerrit Code Review
commit 19258857ef

View file

@ -219,7 +219,7 @@ func RegisterPreDepsMutators(ctx android.RegisterMutatorsContext) {
} }
func RegisterPostDepsMutators(ctx android.RegisterMutatorsContext) { func RegisterPostDepsMutators(ctx android.RegisterMutatorsContext) {
ctx.TopDown("apex_deps", apexDepsMutator) ctx.BottomUp("apex_deps", apexDepsMutator)
ctx.BottomUp("apex", apexMutator).Parallel() ctx.BottomUp("apex", apexMutator).Parallel()
ctx.BottomUp("apex_flattened", apexFlattenedMutator).Parallel() ctx.BottomUp("apex_flattened", apexFlattenedMutator).Parallel()
ctx.BottomUp("apex_uses", apexUsesMutator).Parallel() ctx.BottomUp("apex_uses", apexUsesMutator).Parallel()
@ -272,7 +272,7 @@ func apexVndkDepsMutator(mctx android.BottomUpMutatorContext) {
// Mark the direct and transitive dependencies of apex bundles so that they // Mark the direct and transitive dependencies of apex bundles so that they
// can be built for the apex bundles. // can be built for the apex bundles.
func apexDepsMutator(mctx android.TopDownMutatorContext) { func apexDepsMutator(mctx android.BottomUpMutatorContext) {
if a, ok := mctx.Module().(*apexBundle); ok { if a, ok := mctx.Module().(*apexBundle); ok {
apexBundleName := mctx.ModuleName() apexBundleName := mctx.ModuleName()
mctx.WalkDeps(func(child, parent android.Module) bool { mctx.WalkDeps(func(child, parent android.Module) bool {