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

Merge "Replace core-junit with legacy-test"

Browse Source
This commit is contained in:
Paul Duffin
2016-12-01 09:35:47 +00:00
committed by Gerrit Code Review
parent a2f296f054 2b67e3b9c1
commit 241b1c8b06
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java.go
View File

@@ -70,7 +70,7 @@ type javaBaseProperties struct {
// list of directories that should be excluded from java_resource_dirs // list of directories that should be excluded from java_resource_dirs
Exclude_java_resource_dirs []string `android:"arch_variant"` Exclude_java_resource_dirs []string `android:"arch_variant"`
// don't build against the default libraries (core-libart, core-junit, // don't build against the default libraries (legacy-test, core-junit,
// ext, and framework for device targets) // ext, and framework for device targets)
No_standard_libraries bool No_standard_libraries bool
@@ -188,7 +188,7 @@ func (j *javaBase) BootClasspath(ctx android.BaseContext) string {
} }
} }
var defaultJavaLibraries = []string{"core-libart", "core-junit", "ext", "framework"} var defaultJavaLibraries = []string{"core-libart", "legacy-test", "ext", "framework"}
func (j *javaBase) DepsMutator(ctx android.BottomUpMutatorContext) { func (j *javaBase) DepsMutator(ctx android.BottomUpMutatorContext) {
if j, ok := ctx.Module().(JavaModuleType); ok { if j, ok := ctx.Module().(JavaModuleType); ok {