Dedup system modules and sdk library module type registration

Test: m checkbuild
Bug: 146540677
Change-Id: I982fcb8d723e8e2f7679434051ddc427d4fbd7be
This commit is contained in:
Paul Duffin
2019-12-19 11:18:54 +00:00
parent b0f850784a
commit 43dc1cc2bc
5 changed files with 16 additions and 8 deletions

View File

@@ -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"`