diff options
| author | 2019-06-18 22:48:22 +0000 | |
|---|---|---|
| committer | 2019-06-18 22:48:22 +0000 | |
| commit | f8a698a0c6d76fb6717095742d907a83d03140f1 (patch) | |
| tree | 654a7625128fd6a37dac800c5f298bd31d6c059c /java/java.go | |
| parent | 4b1f4fe1389bd974ded1ce7a3366d96ed5dff7db (diff) | |
| parent | 0f41678d008f433b5d88c2d3e211e8cdde08502c (diff) | |
Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules"
* changes:
Expand the dexpreopt image dependencies to entire image
Depend on all the files from system modules
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 4b3845161..a2e9ab023 100644 --- a/java/java.go +++ b/java/java.go @@ -628,6 +628,7 @@ type deps struct { srcs android.Paths srcJars android.Paths systemModules android.Path + systemModulesDeps android.Paths aidlPreprocess android.OptionalPath kotlinStdlib android.Paths kotlinAnnotations android.Paths @@ -835,10 +836,11 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { panic("Found two system module dependencies") } sm := module.(*SystemModules) - if sm.outputFile == nil { + if sm.outputDir == nil || len(sm.outputDeps) == 0 { panic("Missing directory for system module dependency") } - deps.systemModules = sm.outputFile + deps.systemModules = sm.outputDir + deps.systemModulesDeps = sm.outputDeps } } }) @@ -968,6 +970,7 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB // systemModules if deps.systemModules != nil { flags.systemModules = append(flags.systemModules, deps.systemModules) + flags.systemModulesDeps = append(flags.systemModulesDeps, deps.systemModulesDeps...) } // aidl flags. |