diff options
| author | Colin Cross <ccross@android.com> | 2018-08-14 16:42:33 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-08-15 11:08:59 -0700 |
| commit | b628ea532772ff33d2582cfa2e2fb28f23bf6462 (patch) | |
| tree | 8aa0d6ebdfccda3bdd36c866f18bd76c3ab915ec /java/java.go | |
| parent | d96ca35779fd72803014f3789a966de70583778e (diff) | |
Don't link java tests against junit by default
There is more variety of java tests than I expected, don't
default to including junit, that's just going to lead to
unexpected junit classes for module authors that don't know
to set junit: false. All existing uses of java_test are
already not using junit or setting static_libs: ["junit"],
and all test in Make are already specifying junit.
Bug: 70770641
Test: m checkbuild
Change-Id: I4393b70d87dd2b6e3bb719fdb758915053bee0c7
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/java.go b/java/java.go index a015a9953..b183e2baf 100644 --- a/java/java.go +++ b/java/java.go @@ -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) } |