diff options
| author | 2019-09-20 13:50:52 +0100 | |
|---|---|---|
| committer | 2019-09-20 14:52:56 +0100 | |
| commit | 68289b0efdfbef579085b668754dbc93fc84c05e (patch) | |
| tree | 386c3172e6056794a998c3949eadd06778a50682 /java/system_modules.go | |
| parent | 9f6cbaca2163d0ce5cd680ac68cdb45807e66614 (diff) | |
Add custom SystemModules to bootclasspath to reduce duplication
Adds a library dependency to each of the dummy system modules created
by testing.go so that any changes in the behavior were detected by
the existing tests which were then fixed.
Bug: 141359858
Test: m checkbuild
Change-Id: Id4442f4aa3931ac93049f3367b96a5b49cc075e1
Diffstat (limited to 'java/system_modules.go')
| -rw-r--r-- | java/system_modules.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/system_modules.go b/java/system_modules.go index c616249d5..43e4e118b 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -101,6 +101,9 @@ type SystemModules struct { properties SystemModulesProperties + // The aggregated header jars from all jars specified in the libs property. + // Used when system module is added as a dependency to bootclasspath. + headerJars android.Paths outputDir android.Path outputDeps android.Paths } @@ -118,6 +121,8 @@ func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleConte jars = append(jars, dep.HeaderJars()...) }) + system.headerJars = jars + system.outputDir, system.outputDeps = TransformJarsToSystemModules(ctx, "java.base", jars) } |