diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-12-19 11:18:54 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2019-12-19 19:19:40 +0000 |
| commit | 43dc1cc2bcb600cfaa0ca49788bc13d3d915c3f1 (patch) | |
| tree | e76de923645bbc373be0c18d777308cc23e726f0 /java | |
| parent | b0f850784acef479cfc1b351ffb6196f12ebda85 (diff) | |
| download | build_soong-43dc1cc2bcb600cfaa0ca49788bc13d3d915c3f1.tar.gz build_soong-43dc1cc2bcb600cfaa0ca49788bc13d3d915c3f1.tar.bz2 build_soong-43dc1cc2bcb600cfaa0ca49788bc13d3d915c3f1.zip | |
Dedup system modules and sdk library module type registration
Test: m checkbuild
Bug: 146540677
Change-Id: I982fcb8d723e8e2f7679434051ddc427d4fbd7be
Diffstat (limited to 'java')
| -rw-r--r-- | java/java_test.go | 5 | ||||
| -rw-r--r-- | java/sdk_library.go | 8 | ||||
| -rw-r--r-- | java/system_modules.go | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/java/java_test.go b/java/java_test.go index d9a43f59..adc5ad18 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -67,14 +67,13 @@ func testContext() *android.TestContext { RegisterAppBuildComponents(ctx) RegisterAARBuildComponents(ctx) RegisterGenRuleBuildComponents(ctx) - ctx.RegisterModuleType("java_system_modules", SystemModulesFactory) + RegisterSystemModulesBuildComponents(ctx) ctx.RegisterModuleType("java_plugin", PluginFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) ctx.RegisterModuleType("genrule", genrule.GenRuleFactory) RegisterDocsBuildComponents(ctx) RegisterStubsBuildComponents(ctx) - ctx.RegisterModuleType("java_sdk_library", SdkLibraryFactory) - ctx.RegisterModuleType("java_sdk_library_import", sdkLibraryImportFactory) + RegisterSdkLibraryBuildComponents(ctx) ctx.RegisterModuleType("prebuilt_apis", PrebuiltApisFactory) ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators) ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators) diff --git a/java/sdk_library.go b/java/sdk_library.go index e204659e..32b2d1ac 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"` diff --git a/java/system_modules.go b/java/system_modules.go index b56a401d..ed2fc185 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -28,11 +28,15 @@ import ( // system modules in a runtime image using the jmod and jlink tools. func init() { - android.RegisterModuleType("java_system_modules", SystemModulesFactory) + RegisterSystemModulesBuildComponents(android.InitRegistrationContext) pctx.SourcePathVariable("moduleInfoJavaPath", "build/soong/scripts/jars-to-module-info-java.sh") } +func RegisterSystemModulesBuildComponents(ctx android.RegistrationContext) { + ctx.RegisterModuleType("java_system_modules", SystemModulesFactory) +} + var ( jarsTosystemModules = pctx.AndroidStaticRule("jarsTosystemModules", blueprint.RuleParams{ Command: `rm -rf ${outDir} ${workDir} && mkdir -p ${workDir}/jmod && ` + |