Don't link java tests against junit by default

am: b628ea5327

Change-Id: I7deab68230c2394e991bf528dfdfa68629e03a11
This commit is contained in:
Colin Cross
2018-08-16 21:51:32 -07:00
committed by android-build-merger

View File

@@ -1343,13 +1343,10 @@ func LibraryHostFactory() android.Module {
}
//
// Java Junit Tests
// Java Tests
//
type testProperties struct {
// If true, add a static dependency on the platform junit library. Defaults to true.
Junit *bool
// list of compatibility suites (for example "cts", "vts") that the module should be
// installed into.
Test_suites []string `android:"arch_variant"`
@@ -1381,9 +1378,6 @@ func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) {
j.deps(ctx)
if BoolDefault(j.testProperties.Junit, true) {
ctx.AddDependency(ctx.Module(), staticLibTag, "junit")
}
android.ExtractSourceDeps(ctx, j.testProperties.Test_config)
android.ExtractSourcesDeps(ctx, j.testProperties.Data)
}