diff options
| author | 2017-06-22 17:20:19 -0700 | |
|---|---|---|
| committer | 2017-06-23 11:24:54 -0700 | |
| commit | 3e3e72da90ab94f0a763b6b53567ff335c9e1b3e (patch) | |
| tree | 78b631c43d76222544b95ff1cd4a3cb040aef69d /java/java.go | |
| parent | 540eff8e5fcabe9db02b00bdc82fd28632ba5835 (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 01a05f077..20661c479 100644 --- a/java/java.go +++ b/java/java.go @@ -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()) |