Merge "Use StopServicesSetup to stop/start framework." into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
fa891cb178
@@ -345,9 +345,7 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) {
|
|||||||
}
|
}
|
||||||
if Bool(test.Properties.Disable_framework) {
|
if Bool(test.Properties.Disable_framework) {
|
||||||
var options []tradefed.Option
|
var options []tradefed.Option
|
||||||
options = append(options, tradefed.Option{Name: "run-command", Value: "stop"})
|
configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.StopServicesSetup", options})
|
||||||
options = append(options, tradefed.Option{Name: "teardown-command", Value: "start"})
|
|
||||||
configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.RunCommandTargetPreparer", options})
|
|
||||||
}
|
}
|
||||||
if Bool(test.testDecorator.Properties.Isolated) {
|
if Bool(test.testDecorator.Properties.Isolated) {
|
||||||
configs = append(configs, tradefed.Option{Name: "not-shardable", Value: "true"})
|
configs = append(configs, tradefed.Option{Name: "not-shardable", Value: "true"})
|
||||||
|
Reference in New Issue
Block a user