Merge "Set strict_mode to true" into main (81362a73) · Commits · e / os / android_build_soong

java/robolectric.go

+5 −2

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) {

		if v := String(r.robolectricProperties.Robolectric_prebuilt_version); v != "" {
		ctx.AddVariationDependencies(nil, libTag, fmt.Sprintf(robolectricPrebuiltLibPattern, v))
		} else if !proptools.Bool(r.robolectricProperties.Strict_mode) {
		} else if !proptools.BoolDefault(r.robolectricProperties.Strict_mode, true) {
		if proptools.Bool(r.robolectricProperties.Upstream) {
		ctx.AddVariationDependencies(nil, libTag, robolectricCurrentLib+"_upstream")
		} else {
		@@ -124,8 +124,11 @@ func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) {
		}
		}

		if proptools.Bool(r.robolectricProperties.Strict_mode) {
		if proptools.BoolDefault(r.robolectricProperties.Strict_mode, true) {
		ctx.AddVariationDependencies(nil, roboRuntimeOnlyTag, robolectricCurrentLib+"_upstream")
		} else {
		// opting out from strict mode, robolectric_non_strict_mode_permission lib should be added
		ctx.AddVariationDependencies(nil, libTag, "robolectric_non_strict_mode_permission")
		}

		ctx.AddVariationDependencies(nil, libTag, robolectricDefaultLibs...)