Merge "Revert "Force gtest to use adb unroot if required_root is false or not set""
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user