diff options
author | Paul Duffin <paulduffin@google.com> | 2019-12-19 11:18:54 +0000 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2019-12-19 19:19:40 +0000 |
commit | 43dc1cc2bcb600cfaa0ca49788bc13d3d915c3f1 (patch) | |
tree | e76de923645bbc373be0c18d777308cc23e726f0 /java/java_test.go | |
parent | b0f850784acef479cfc1b351ffb6196f12ebda85 (diff) |
Dedup system modules and sdk library module type registration
Test: m checkbuild
Bug: 146540677
Change-Id: I982fcb8d723e8e2f7679434051ddc427d4fbd7be
Diffstat (limited to 'java/java_test.go')
-rw-r--r-- | java/java_test.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/java_test.go b/java/java_test.go index d9a43f593..adc5ad181 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -67,14 +67,13 @@ func testContext() *android.TestContext { RegisterAppBuildComponents(ctx) RegisterAARBuildComponents(ctx) RegisterGenRuleBuildComponents(ctx) - ctx.RegisterModuleType("java_system_modules", SystemModulesFactory) + RegisterSystemModulesBuildComponents(ctx) ctx.RegisterModuleType("java_plugin", PluginFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) ctx.RegisterModuleType("genrule", genrule.GenRuleFactory) RegisterDocsBuildComponents(ctx) RegisterStubsBuildComponents(ctx) - ctx.RegisterModuleType("java_sdk_library", SdkLibraryFactory) - ctx.RegisterModuleType("java_sdk_library_import", sdkLibraryImportFactory) + RegisterSdkLibraryBuildComponents(ctx) ctx.RegisterModuleType("prebuilt_apis", PrebuiltApisFactory) ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators) ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators) |