diff options
| author | 2019-09-23 10:31:40 +0000 | |
|---|---|---|
| committer | 2019-09-23 10:31:40 +0000 | |
| commit | 2b6f04ca42adbd0ae653fe03649c39e0300d3a6b (patch) | |
| tree | ff590aa5944326d1a48739706533b182ada249ba /java/system_modules.go | |
| parent | b1102ba82847928276fc7a8edcba21396c2cb541 (diff) | |
| parent | 68289b0efdfbef579085b668754dbc93fc84c05e (diff) | |
Merge "Add custom SystemModules to bootclasspath to reduce duplication"
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) } |