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
diff --git a/java/java_test.go b/java/java_test.go
index 46cd2e3..ea212a3 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -71,10 +71,8 @@
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 TestDroiddoc(t *testing.T) {
ctx, _ := testJava(t, `
- droiddoc_template {
+ droiddoc_exported_dir {
name: "droiddoc-templates-sdk",
path: ".",
}
@@ -1021,7 +1019,7 @@
func TestJavaSdkLibrary(t *testing.T) {
ctx, _ := testJava(t, `
- droiddoc_template {
+ droiddoc_exported_dir {
name: "droiddoc-templates-sdk",
path: ".",
}