From 1a5eeb3e3573a8f55c75b35c0f24901a607751b5 Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Sat, 14 Sep 2019 03:06:26 +0000 Subject: [PATCH] Revert "Force gtest to use adb unroot if required_root is false or not set" This reverts commit b2cb324ce16100ea4898a08ba281267e6ef1a96d. Reason for revert: broke host-side test mapping Change-Id: Iea63395d525444421fc27ef5bc660362eba11db0 --- cc/test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cc/test.go b/cc/test.go index a5a368071..1a0d44fd6 100644 --- a/cc/test.go +++ b/cc/test.go @@ -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