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

java: add default libraries for device builds

Browse Source 
Add implicit libraries core-libart, core-junit, ext, and framework
to device java builds.

Change-Id: I8b4e1e54bfd4bc89fbcd211ab8da6bbcf092c523
This commit is contained in:
Colin Cross
2015-04-16 14:08:06 -07:00
parent e7a9f3f7ed
commit efb9ebe14f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java.go
View File

@@ -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 { func (j *javaBase) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string {
var deps []string var deps []string
@@ -162,6 +164,9 @@ func (j *javaBase) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerM
if bootClasspath != "" { if bootClasspath != "" {
deps = append(deps, 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_libs...)
deps = append(deps, j.properties.Java_static_libs...) deps = append(deps, j.properties.Java_static_libs...)