From a308ea159178d930bfd62bd9b4489ad99c9b9bc9 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 15 Nov 2019 10:38:39 +0900 Subject: [PATCH] apexDepsMutator is now bottom-up mutator ... in preparation for override_apex. Bug: 144338929 Test: m Change-Id: I6c19e384edc089fe5c8aa9bd00082178bd1a37a2 --- apex/apex.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index f03a8f974..e3f3a783a 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -219,7 +219,7 @@ func RegisterPreDepsMutators(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_flattened", apexFlattenedMutator).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 // can be built for the apex bundles. -func apexDepsMutator(mctx android.TopDownMutatorContext) { +func apexDepsMutator(mctx android.BottomUpMutatorContext) { if a, ok := mctx.Module().(*apexBundle); ok { apexBundleName := mctx.ModuleName() mctx.WalkDeps(func(child, parent android.Module) bool {