From 43dc1cc2bcb600cfaa0ca49788bc13d3d915c3f1 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 19 Dec 2019 11:18:54 +0000 Subject: Dedup system modules and sdk library module type registration Test: m checkbuild Bug: 146540677 Change-Id: I982fcb8d723e8e2f7679434051ddc427d4fbd7be --- java/java_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'java/java_test.go') 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) -- cgit v1.2.3-59-g8ed1b