diff options
| author | Colin Cross <ccross@android.com> | 2015-04-16 14:08:06 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-20 13:55:27 -0700 |
| commit | efb9ebe14fdb29c9f1cdb35297d9250976720dcf (patch) | |
| tree | 25f753e3de3085d33e566ce41ab7a54983744bc9 /java | |
| parent | e7a9f3f7ed0718692a239f4c232dc1fe1346798a (diff) | |
| download | build_soong-efb9ebe14fdb29c9f1cdb35297d9250976720dcf.tar.gz build_soong-efb9ebe14fdb29c9f1cdb35297d9250976720dcf.tar.bz2 build_soong-efb9ebe14fdb29c9f1cdb35297d9250976720dcf.zip | |
java: add default libraries for device builds
Add implicit libraries core-libart, core-junit, ext, and framework
to device java builds.
Change-Id: I8b4e1e54bfd4bc89fbcd211ab8da6bbcf092c523
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 2a04f701..6ad53072 100644 --- a/java/java.go +++ b/java/java.go @@ -154,6 +154,8 @@ func (j *javaBase) BootClasspath(ctx common.AndroidBaseContext) string { } } +var defaultJavaLibraries = []string{"core-libart", "core-junit", "ext", "framework"} + func (j *javaBase) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string { var deps []string @@ -162,6 +164,9 @@ func (j *javaBase) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerM if bootClasspath != "" { deps = append(deps, bootClasspath) } + if ctx.Device() && j.properties.Sdk_version == "" { + deps = append(deps, defaultJavaLibraries...) + } } deps = append(deps, j.properties.Java_libs...) deps = append(deps, j.properties.Java_static_libs...) |