Merge "Revert "Revert "Force gtest to use adb unroot if required_root is false or not set""" (f7e6870f) · Commits · e / os / android_build_soong

cc/test.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -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