diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-12-19 22:43:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-19 22:43:02 +0000 |
| commit | b237de1914ab2f4ce63577e4c6f165ec137168fd (patch) | |
| tree | 1c70465f056740cd080ec558a7b40b1ad26bbaa3 /java/java_test.go | |
| parent | f6b213f0505adf32084757c5897eadeacbe2cae9 (diff) | |
| parent | 59986b23cc4679f38f305f059c446bd9c4a01032 (diff) | |
Merge changes I7e9440a0,I7f1a4b64,If5d6fdac
* changes:
Dedup cc prebuilts module type registration
Detect registration of duplicate module/singleton types
Dedup prebuilt apis module type/mutator registration
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)) |