diff options
| author | 2019-12-19 11:18:54 +0000 | |
|---|---|---|
| committer | 2019-12-19 19:19:40 +0000 | |
| commit | 43dc1cc2bcb600cfaa0ca49788bc13d3d915c3f1 (patch) | |
| tree | e76de923645bbc373be0c18d777308cc23e726f0 /java/system_modules.go | |
| parent | b0f850784acef479cfc1b351ffb6196f12ebda85 (diff) | |
Dedup system modules and sdk library module type registration
Test: m checkbuild
Bug: 146540677
Change-Id: I982fcb8d723e8e2f7679434051ddc427d4fbd7be
Diffstat (limited to 'java/system_modules.go')
| -rw-r--r-- | java/system_modules.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/system_modules.go b/java/system_modules.go index b56a401d3..ed2fc1856 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 && ` + |