diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/robolectric.go | 3 | ||||
| -rw-r--r-- | java/robolectric_test.go | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/java/robolectric.go b/java/robolectric.go index 5f46267f9..3b2c65611 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -41,6 +41,7 @@ var robolectricDefaultLibs = []string{ } const robolectricCurrentLib = "Robolectric_all-target" +const clearcutJunitLib = "ClearcutJunitListenerAar" const robolectricPrebuiltLibPattern = "platform-robolectric-%s-prebuilt" var ( @@ -106,6 +107,8 @@ func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) { ctx.PropertyErrorf("instrumentation_for", "missing required instrumented module") } + ctx.AddVariationDependencies(nil, staticLibTag, clearcutJunitLib) + if v := String(r.robolectricProperties.Robolectric_prebuilt_version); v != "" { ctx.AddVariationDependencies(nil, staticLibTag, fmt.Sprintf(robolectricPrebuiltLibPattern, v)) } else if !proptools.BoolDefault(r.robolectricProperties.Strict_mode, true) { diff --git a/java/robolectric_test.go b/java/robolectric_test.go index 4775bac64..a2474e8d0 100644 --- a/java/robolectric_test.go +++ b/java/robolectric_test.go @@ -44,6 +44,12 @@ var prepareRobolectricRuntime = android.GroupFixturePreparers( java_library { name: "junitxml", srcs: ["JUnitXml.java"] + + } + + java_library { + name: "ClearcutJunitListenerAar", + srcs: ["Runtime.java"] } java_library_host { |