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

Don't link java tests against junit by default am: b628ea5327 am: 7973efc07b

Browse Source 
am: ad04436e12

Change-Id: Ibd23ec94fb76644a54e92cc932b2d0ae8c63a57e
This commit is contained in:
Colin Cross
2018-08-16 23:50:15 -07:00
committed by android-build-merger
parent cde88ccbd3 ad04436e12
commit 655cc9e674
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java.go
View File

@@ -1337,13 +1337,10 @@ func LibraryHostFactory() android.Module {
} }
// //
// Java Junit Tests // Java Tests
// //
type testProperties struct { 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 // list of compatibility suites (for example "cts", "vts") that the module should be
// installed into. // installed into.
Test_suites []string `android:"arch_variant"` Test_suites []string `android:"arch_variant"`
@@ -1375,9 +1372,6 @@ func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) { func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) {
j.deps(ctx) j.deps(ctx)
if BoolDefault(j.testProperties.Junit, true) {
ctx.AddDependency(ctx.Module(), staticLibTag, "junit")
}
android.ExtractSourceDeps(ctx, j.testProperties.Test_config) android.ExtractSourceDeps(ctx, j.testProperties.Test_config)
android.ExtractSourcesDeps(ctx, j.testProperties.Data) android.ExtractSourcesDeps(ctx, j.testProperties.Data)
} }