diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index c6041861..448580ec 100644 --- a/java/java.go +++ b/java/java.go @@ -162,14 +162,14 @@ func (j *javaBase) collectDeps(ctx common.AndroidModuleContext) (classpath []str ctx.VisitDirectDeps(func(module blueprint.Module) { otherName := ctx.OtherModuleName(module) if javaDep, ok := module.(JavaDependency); ok { - if inList(otherName, j.properties.Java_libs) { + if otherName == j.BootClasspath(ctx) { + bootClasspath = javaDep.ClasspathFile() + } else if inList(otherName, j.properties.Java_libs) { classpath = append(classpath, javaDep.ClasspathFile()) } else if inList(otherName, j.properties.Java_static_libs) { classpath = append(classpath, javaDep.ClasspathFile()) classJarSpecs = append(classJarSpecs, javaDep.ClassJarSpecs()...) resourceJarSpecs = append(resourceJarSpecs, javaDep.ResourceJarSpecs()...) - } else if otherName == j.BootClasspath(ctx) { - bootClasspath = javaDep.ClasspathFile() } else { panic(fmt.Errorf("unknown dependency %q for %q", otherName, ctx.ModuleName())) } |