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

Commit a4752582 authored by Pechetty Sravani's avatar Pechetty Sravani Committed by Gerrit Code Review
Browse files

Revert "Set strict_mode to true" 

Revert submission 3070929-strictMode+whiteList

Reason for revert: Droidmonitor created revert due to b/349925587. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3070929-strictMode%252BwhiteList

Change-Id: I2df256e81a26de4b1f4c35da5194d5aba8ae0a43
parent ba791b18

java/robolectric.go

+2 −5
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.BoolDefault(r.robolectricProperties.Strict_mode, true) {

	} else if !proptools.Bool(r.robolectricProperties.Strict_mode) {

		if proptools.Bool(r.robolectricProperties.Upstream) {

			ctx.AddVariationDependencies(nil, libTag, robolectricCurrentLib+"_upstream")

		} else {
@@ -124,11 +124,8 @@ func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) { 
		}

	}



	if proptools.BoolDefault(r.robolectricProperties.Strict_mode, true) {

	if proptools.Bool(r.robolectricProperties.Strict_mode) {

		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...)