Add java config and share it with make
Add a java/config package to hold config information, and share
it with make through makevars.
Test: builds
Change-Id: I46c088bda0fe97a1823bfdd80fa692d0bf61da1b
diff --git a/java/java.go b/java/java.go
index 01a05f0..20661c4 100644
--- a/java/java.go
+++ b/java/java.go
@@ -26,6 +26,7 @@
"android/soong/android"
"android/soong/genrule"
+ "android/soong/java/config"
)
func init() {
@@ -169,8 +170,6 @@
}
}
-var defaultJavaLibraries = []string{"core-libart", "legacy-test", "ext", "framework"}
-
func (j *Module) deps(ctx android.BottomUpMutatorContext) {
var deps []string
@@ -180,7 +179,7 @@
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 @@
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())