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

Commit 1a5eeb3e authored by Julien Desprez's avatar Julien Desprez
Browse files

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

This reverts commit b2cb324c.

Reason for revert: broke host-side test mapping

Change-Id: Iea63395d525444421fc27ef5bc660362eba11db0
parent b2cb324c

cc/test.go

+0 −4
Original line number Diff line number Diff line
@@ -317,10 +317,6 @@ 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