From b2cb324ce16100ea4898a08ba281267e6ef1a96d Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Thu, 12 Sep 2019 10:54:49 -0700 Subject: [PATCH] Force gtest to use adb unroot if required_root is false or not set Bug: 140123924 Test: atest hello_world_test Change-Id: I36fb31d274c179dc8510e08cdb5dc79601546299 --- cc/test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cc/test.go b/cc/test.go index 1a0d44fd6..a5a368071 100644 --- a/cc/test.go +++ b/cc/test.go @@ -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