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

Commit bc0f2602 authored by Dan Shi's avatar Dan Shi
Browse files

Revert "Revert "Force gtest to use adb unroot if required_root is false or not set"" 

This reverts commit 1a5eeb3e.

Reason for revert: Fix landed in aosp/1122723

Change-Id: I8b487d602d48b9dba35affc8eb31578efd815e52
parent 1a5eeb3e

cc/test.go

+4 −0
Original line number Diff line number Diff line
@@ -317,6 +317,10 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) { 
	var configs []tradefed.Config

	if Bool(test.Properties.Require_root) {

		configs = append(configs, tradefed.Preparer{"com.android.tradefed.targetprep.RootTargetPreparer", nil})

	} else {

		var options []tradefed.Option

		options = append(options, tradefed.Option{"force-root", "false"})

		configs = append(configs, tradefed.Preparer{"com.android.tradefed.targetprep.RootTargetPreparer", options})

	}

	if Bool(test.Properties.Disable_framework) {

		var options []tradefed.Option