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/sdk_library.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index e204659e8..32b2d1ac2 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -68,8 +68,7 @@ var ( // 2) HTML generation func init() { - android.RegisterModuleType("java_sdk_library", SdkLibraryFactory) - android.RegisterModuleType("java_sdk_library_import", sdkLibraryImportFactory) + RegisterSdkLibraryBuildComponents(android.InitRegistrationContext) android.RegisterMakeVarsProvider(pctx, func(ctx android.MakeVarsContext) { javaSdkLibraries := javaSdkLibraries(ctx.Config()) @@ -78,6 +77,11 @@ func init() { }) } +func RegisterSdkLibraryBuildComponents(ctx android.RegistrationContext) { + ctx.RegisterModuleType("java_sdk_library", SdkLibraryFactory) + ctx.RegisterModuleType("java_sdk_library_import", sdkLibraryImportFactory) +} + type sdkLibraryProperties struct { // List of Java libraries that will be in the classpath when building stubs Stub_only_libs []string `android:"arch_variant"` -- cgit v1.2.3-59-g8ed1b