From c988c8e202cf4dc9958ad93d33217caaf28501cf Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 29 Apr 2020 18:27:14 +0100 Subject: Move prebuilts mutators after defaults have been applied A follow up change will add a mechanism for a module to register a hook that is called after any defaults have been applied. That is intended for use by modules like java_sdk_library that create child modules that are dependent upon properties that could be supplied by defaults. Creating those child modules after prebuilts mutators are run will cause problems if those child modules clash with prebuilts modules. Moving the prebuilts mutators after the defaults mutators will fix that. Tests are currently being run with the mutators in different orders so this change also cleans that up so they are consistent with the actual code that is being run. Bug: 155295806 Test: m checkbuild Change-Id: I825c6df09058fb3a45db196661959eb332aca2f3 --- apex/apex_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index ce39b39e4..dc6986244 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4530,12 +4530,12 @@ func testNoUpdatableJarsInBootImage(t *testing.T, errmsg, bp string, transformDe ctx.RegisterModuleType("apex", BundleFactory) ctx.RegisterModuleType("apex_key", ApexKeyFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) + ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) cc.RegisterRequiredBuildComponentsForTest(ctx) java.RegisterJavaBuildComponents(ctx) java.RegisterSystemModulesBuildComponents(ctx) java.RegisterAppBuildComponents(ctx) java.RegisterDexpreoptBootJarsComponents(ctx) - ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) ctx.PreDepsMutators(RegisterPreDepsMutators) ctx.PostDepsMutators(RegisterPostDepsMutators) -- cgit v1.2.3-59-g8ed1b