diff options
| author | 2019-12-19 15:38:25 +0000 | |
|---|---|---|
| committer | 2019-12-19 15:38:25 +0000 | |
| commit | 65b174c9c7ce40f38de4236c3ecdb08a4f7866d1 (patch) | |
| tree | a38a758ed07a8feb01c5d42dee46ed0d89f94bd8 /java/java_test.go | |
| parent | 13c929e32e743dfc09762086c72479208cfacc81 (diff) | |
| parent | f9b1da0fcb4b76b04c96a355bec7845cdf87ba7e (diff) | |
Merge "Dedup registration code for module types and singletons"
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/java/java_test.go b/java/java_test.go index 49838c7c7..32527365c 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -63,27 +63,12 @@ func testConfig(env map[string]string, bp string, fs map[string][]byte) android. func testContext() *android.TestContext { ctx := android.NewTestArchContext() - ctx.RegisterModuleType("android_app", AndroidAppFactory) - ctx.RegisterModuleType("android_app_certificate", AndroidAppCertificateFactory) - ctx.RegisterModuleType("android_app_import", AndroidAppImportFactory) - ctx.RegisterModuleType("android_library", AndroidLibraryFactory) - ctx.RegisterModuleType("android_test", AndroidTestFactory) - ctx.RegisterModuleType("android_test_helper_app", AndroidTestHelperAppFactory) - ctx.RegisterModuleType("android_test_import", AndroidTestImportFactory) - ctx.RegisterModuleType("java_binary", BinaryFactory) - ctx.RegisterModuleType("java_binary_host", BinaryHostFactory) - ctx.RegisterModuleType("java_device_for_host", DeviceForHostFactory) - ctx.RegisterModuleType("java_host_for_device", HostForDeviceFactory) - ctx.RegisterModuleType("java_library", LibraryFactory) - ctx.RegisterModuleType("java_library_host", LibraryHostFactory) - ctx.RegisterModuleType("java_test", TestFactory) - ctx.RegisterModuleType("java_import", ImportFactory) - ctx.RegisterModuleType("java_import_host", ImportFactoryHost) - ctx.RegisterModuleType("java_defaults", DefaultsFactory) + RegisterJavaBuildComponents(ctx) + RegisterAppBuildComponents(ctx) + RegisterAARBuildComponents(ctx) ctx.RegisterModuleType("java_system_modules", SystemModulesFactory) ctx.RegisterModuleType("java_genrule", genRuleFactory) ctx.RegisterModuleType("java_plugin", PluginFactory) - ctx.RegisterModuleType("dex_import", DexImportFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) ctx.RegisterModuleType("genrule", genrule.GenRuleFactory) ctx.RegisterModuleType("droiddoc", DroiddocFactory) @@ -92,8 +77,6 @@ func testContext() *android.TestContext { ctx.RegisterModuleType("prebuilt_stubs_sources", PrebuiltStubsSourcesFactory) ctx.RegisterModuleType("java_sdk_library", SdkLibraryFactory) ctx.RegisterModuleType("java_sdk_library_import", sdkLibraryImportFactory) - ctx.RegisterModuleType("override_android_app", OverrideAndroidAppModuleFactory) - ctx.RegisterModuleType("override_android_test", OverrideAndroidTestModuleFactory) ctx.RegisterModuleType("prebuilt_apis", PrebuiltApisFactory) ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators) ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators) |