diff options
| author | 2020-02-19 21:08:57 +0000 | |
|---|---|---|
| committer | 2020-02-19 21:08:57 +0000 | |
| commit | 1876a762161179dc5af51653d1707ffff144e391 (patch) | |
| tree | cc8e192a8bb637270b06b40c10b2430a4c473d65 /java/java.go | |
| parent | 24f3c99af8e6c7689e840289881ee6bcfacb718b (diff) | |
| parent | 83a2d967decd1b76a01571dd76c6c8ce54b9b8ea (diff) | |
Merge "Allow java_system_modules_import to replace java_system_modules"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/java/java.go b/java/java.go index c3e2c9656..462dba809 100644 --- a/java/java.go +++ b/java/java.go @@ -1031,18 +1031,16 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { case bootClasspathTag: // If a system modules dependency has been added to the bootclasspath // then add its libs to the bootclasspath. - sm := module.(*SystemModules) - deps.bootClasspath = append(deps.bootClasspath, sm.headerJars...) + sm := module.(SystemModulesProvider) + deps.bootClasspath = append(deps.bootClasspath, sm.HeaderJars()...) case systemModulesTag: if deps.systemModules != nil { panic("Found two system module dependencies") } - sm := module.(*SystemModules) - if sm.outputDir == nil || len(sm.outputDeps) == 0 { - panic("Missing directory for system module dependency") - } - deps.systemModules = &systemModules{sm.outputDir, sm.outputDeps} + sm := module.(SystemModulesProvider) + outputDir, outputDeps := sm.OutputDirAndDeps() + deps.systemModules = &systemModules{outputDir, outputDeps} } } }) |