Merge "Replace core-junit with legacy-test"

am: 241b1c8b06

Change-Id: Icb451e322f3673f588daf9de3f39cbdac8da8558
This commit is contained in:
Paul Duffin 2016-12-01 09:46:40 +00:00 committed by android-build-merger
commit 399c4fa858
1 changed files with 2 additions and 2 deletions

View File

@ -70,7 +70,7 @@ type javaBaseProperties struct {
// list of directories that should be excluded from java_resource_dirs
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)
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) {
if j, ok := ctx.Module().(JavaModuleType); ok {