From a48f758d840290dd75fced5234e1c178bf3dc113 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 19 Dec 2019 11:25:19 +0000 Subject: Dedup prebuilt apis module type/mutator registration Test: m checkbuild Bug: 146540677 Change-Id: If5d6fdace2574df6314fbcf6441838cd11df58ae --- java/java_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index adc5ad181..1f259627e 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -74,13 +74,12 @@ func testContext() *android.TestContext { RegisterDocsBuildComponents(ctx) RegisterStubsBuildComponents(ctx) RegisterSdkLibraryBuildComponents(ctx) - ctx.RegisterModuleType("prebuilt_apis", PrebuiltApisFactory) ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators) ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) - ctx.PreArchMutators(func(ctx android.RegisterMutatorsContext) { - ctx.TopDown("prebuilt_apis", PrebuiltApisMutator).Parallel() - }) + + RegisterPrebuiltApisBuildComponents(ctx) + ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(OverlaySingletonFactory)) ctx.RegisterPreSingletonType("sdk_versions", android.SingletonFactoryAdaptor(sdkPreSingletonFactory)) -- cgit v1.2.3-59-g8ed1b