StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add java config and share it with make

Browse Source 
Add a java/config package to hold config information, and share
it with make through makevars.

Test: builds
Change-Id: I46c088bda0fe97a1823bfdd80fa692d0bf61da1b
This commit is contained in:
Colin Cross
2017-06-22 17:20:19 -07:00
parent 540eff8e5f
commit 3e3e72da90
4 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java.go
View File

@@ -26,6 +26,7 @@ import (
"android/soong/android"
"android/soong/genrule"
"android/soong/java/config"
)
func init() {
@@ -169,8 +170,6 @@ func (j *Module) BootClasspath(ctx android.BaseContext) string {
}
}
var defaultJavaLibraries = []string{"core-libart", "legacy-test", "ext", "framework"}
func (j *Module) deps(ctx android.BottomUpMutatorContext) {
var deps []string
@@ -180,7 +179,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
deps = append(deps, bootClasspath)
}
if ctx.Device() && j.deviceProperties.Sdk_version == "" {
deps = append(deps, defaultJavaLibraries...)
deps = append(deps, config.DefaultLibraries...)
}
}
deps = append(deps, j.properties.Java_libs...)
@@ -218,7 +217,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) (classpath android.Paths
if javaDep, ok := module.(JavaDependency); ok {
if otherName == j.BootClasspath(ctx) {
bootClasspath = android.OptionalPathForPath(javaDep.ClasspathFile())
} else if inList(otherName, defaultJavaLibraries) {
} else if inList(otherName, config.DefaultLibraries) {
classpath = append(classpath, javaDep.ClasspathFile())
} else if inList(otherName, j.properties.Java_libs) {
classpath = append(classpath, javaDep.ClasspathFile())