Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 230b2e73 authored by Rex Hoffman's avatar Rex Hoffman Committed by Automerger Merge Worker
Browse files

Merge "Adds clearcutlistener to junit running robolectric tests." into main am: bdbf4faf 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3431549



Change-Id: I814f9a63f37376f5f89331c786fa61f48e0b0e23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 068b0b27 bdbf4faf

java/robolectric.go

+3 −0
Original line number Diff line number Diff line
@@ -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) {

java/robolectric_test.go

+6 −0
Original line number Diff line number Diff line
@@ -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 {