diff options
| author | 2019-06-13 16:52:01 +0000 | |
|---|---|---|
| committer | 2019-06-18 01:29:02 +0000 | |
| commit | ff60a73d899d2d0d1c23eca503a2aeb3fdbd1feb (patch) | |
| tree | 88096efc2a68d4d18ef29ff55e53995352d1390e /java/java.go | |
| parent | eec8d3aee3cc10df45f6e21f11d623bd91efa1fd (diff) | |
Depend on all the files from system modules
Instead of just one of the files that we pass into javac.
Test: treehugger
Change-Id: I8478e88656487c9f667893d7c17839f0ea63c78f
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. |