diff options
| author | 2019-12-19 10:21:09 +0000 | |
|---|---|---|
| committer | 2019-12-19 19:19:40 +0000 | |
| commit | 884363e782dbd15b980640a1071c8c271315f474 (patch) | |
| tree | cbcb9dbe8104bb21be86bc2eb7329a1983ef4028 /java/java_test.go | |
| parent | f3273c558772008ff2a21a8cb23f84491a65ccc1 (diff) | |
Dedup droiddoc module type registration
Some tests were changed as they were using the wrong name for the
droiddoc_exported_dir module type.
Test: m checkbuild
Bug: 146540677
Change-Id: If57404760d2df3757c93e237696359355cf0c96e
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/java/java_test.go b/java/java_test.go index 46cd2e34e..ea212a33f 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -71,10 +71,8 @@ func testContext() *android.TestContext { ctx.RegisterModuleType("java_plugin", PluginFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) ctx.RegisterModuleType("genrule", genrule.GenRuleFactory) - ctx.RegisterModuleType("droiddoc", DroiddocFactory) - ctx.RegisterModuleType("droiddoc_host", DroiddocHostFactory) - ctx.RegisterModuleType("droiddoc_template", ExportedDroiddocDirFactory) - ctx.RegisterModuleType("prebuilt_stubs_sources", PrebuiltStubsSourcesFactory) + RegisterDocsBuildComponents(ctx) + RegisterStubsBuildComponents(ctx) ctx.RegisterModuleType("java_sdk_library", SdkLibraryFactory) ctx.RegisterModuleType("java_sdk_library_import", sdkLibraryImportFactory) ctx.RegisterModuleType("prebuilt_apis", PrebuiltApisFactory) @@ -875,7 +873,7 @@ func TestSharding(t *testing.T) { func TestDroiddoc(t *testing.T) { ctx, _ := testJava(t, ` - droiddoc_template { + droiddoc_exported_dir { name: "droiddoc-templates-sdk", path: ".", } @@ -1021,7 +1019,7 @@ func TestJavaLibrary(t *testing.T) { func TestJavaSdkLibrary(t *testing.T) { ctx, _ := testJava(t, ` - droiddoc_template { + droiddoc_exported_dir { name: "droiddoc-templates-sdk", path: ".", } |