diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-12-19 11:25:19 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2019-12-19 19:19:40 +0000 |
| commit | a48f758d840290dd75fced5234e1c178bf3dc113 (patch) | |
| tree | 609612a1fce955b0fde14b030b33a76c14632f14 /java/java_test.go | |
| parent | 43dc1cc2bcb600cfaa0ca49788bc13d3d915c3f1 (diff) | |
Dedup prebuilt apis module type/mutator registration
Test: m checkbuild
Bug: 146540677
Change-Id: If5d6fdace2574df6314fbcf6441838cd11df58ae
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
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)) |