diff options
| author | Colin Cross <ccross@android.com> | 2019-03-05 20:06:45 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-05 20:06:45 -0800 |
| commit | ccfe15d92a2a637110c87e2dcaab89a3bda3c17c (patch) | |
| tree | 5be9e0ddef04a7e2e93b41e47ecb1c9ebd6c7f7b /java/java_test.go | |
| parent | 6943b3ca69a7848a45a187ae0cce1c2a1c5795bd (diff) | |
| parent | 3ce8fedd9ad71fe46f2b7ca0911e283a438cb728 (diff) | |
Merge "Add modules for converting java modules between host and device" am: e3ad4144db am: d5f25c7685
am: 3ce8fedd9a
Change-Id: I09f01ae076b93cdec5b738eed00c2d7a40e5555d
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index fe4e24d8d..3857ba848 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -68,10 +68,13 @@ func testContext(config android.Config, bp string, ctx.RegisterModuleType("android_test_helper_app", android.ModuleFactoryAdaptor(AndroidTestHelperAppFactory)) ctx.RegisterModuleType("java_binary", android.ModuleFactoryAdaptor(BinaryFactory)) ctx.RegisterModuleType("java_binary_host", android.ModuleFactoryAdaptor(BinaryHostFactory)) + ctx.RegisterModuleType("java_device_for_host", android.ModuleFactoryAdaptor(DeviceForHostFactory)) + ctx.RegisterModuleType("java_host_for_device", android.ModuleFactoryAdaptor(HostForDeviceFactory)) ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory)) ctx.RegisterModuleType("java_library_host", android.ModuleFactoryAdaptor(LibraryHostFactory)) ctx.RegisterModuleType("java_test", android.ModuleFactoryAdaptor(TestFactory)) ctx.RegisterModuleType("java_import", android.ModuleFactoryAdaptor(ImportFactory)) + ctx.RegisterModuleType("java_import_host", android.ModuleFactoryAdaptor(ImportFactoryHost)) ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory)) ctx.RegisterModuleType("java_system_modules", android.ModuleFactoryAdaptor(SystemModulesFactory)) ctx.RegisterModuleType("java_genrule", android.ModuleFactoryAdaptor(genRuleFactory)) |