StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Force gtest to use adb unroot if required_root is false or not set""

Browse Source 
am: 74b0a4891e

Change-Id: Ie05cc9446230337bb95b8ecac04c444a297c2595
This commit is contained in:
Julien Desprez
2019-09-13 20:21:23 -07:00
committed by android-build-merger
parent 89b7ee9915 74b0a4891e
commit 7583b2d835
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/test.go
View File

@@ -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