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
diff --git a/cc/test.go b/cc/test.go
index a5a3680..1a0d44f 100644
--- a/cc/test.go
+++ b/cc/test.go
@@ -317,10 +317,6 @@
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