diff options
| author | 2020-07-30 16:04:17 +0100 | |
|---|---|---|
| committer | 2020-07-31 16:12:01 +0100 | |
| commit | 021f4e525f987baa3a0b934084a8d49ed4ef00ec (patch) | |
| tree | 2370ba6e80f3ca61178bc9e337dd09cfd3ece2fe /apex/apex_test.go | |
| parent | 359d4f3374f4c985d999d51dd8115f5ecc4dddc5 (diff) | |
Fix prebuilt mutator ordering in tests
Previously, the prebuilt mutators were added by the
cc.RegisterRequiredBuildComponentsForTest() function as a convenience
but unfortunately it lead to some of the mutators being in a different
order in the tests than in the normal build.
This change:
* Extracts the RegisterPrebuiltMutators() call from
cc.RegisterRequiredBuildComponentsForTest()
* Makes sure that the prebuilt mutators are registered before the
visibility gatherer and enforcer mutators.
Bug: 162505935
Test: m nothing
Change-Id: I7d959b558200b502f0a5e4653c41ea01414e142a
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 0959a49ec..bfd7dfe6a 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -236,13 +236,15 @@ func testApexContext(_ *testing.T, bp string, handlers ...testCustomizer) (*andr ctx.PreArchMutators(android.RegisterComponentsMutator) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) - cc.RegisterRequiredBuildComponentsForTest(ctx) + android.RegisterPrebuiltMutators(ctx) - // Register this after the prebuilt mutators have been registered (in - // cc.RegisterRequiredBuildComponentsForTest) to match what happens at runtime. + // Register these after the prebuilt mutators have been registered to match what + // happens at runtime. ctx.PreArchMutators(android.RegisterVisibilityRuleGatherer) ctx.PostDepsMutators(android.RegisterVisibilityRuleEnforcer) + cc.RegisterRequiredBuildComponentsForTest(ctx) + ctx.RegisterModuleType("cc_test", cc.TestFactory) ctx.RegisterModuleType("vndk_prebuilt_shared", cc.VndkPrebuiltSharedFactory) ctx.RegisterModuleType("vndk_libraries_txt", cc.VndkLibrariesTxtFactory) @@ -5542,6 +5544,7 @@ func testNoUpdatableJarsInBootImage(t *testing.T, errmsg string, transformDexpre ctx.RegisterModuleType("apex_key", ApexKeyFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) + android.RegisterPrebuiltMutators(ctx) cc.RegisterRequiredBuildComponentsForTest(ctx) java.RegisterJavaBuildComponents(ctx) java.RegisterSystemModulesBuildComponents(ctx) |