diff options
| author | 2022-12-19 16:27:25 +0000 | |
|---|---|---|
| committer | 2022-12-19 16:27:25 +0000 | |
| commit | 77dc7d0839c53d76092e7b75ba3c3d4734542bbd (patch) | |
| tree | 1a4a81ebfdcb690ca78693761cd6ed33fb2e1caa /rust/benchmark.go | |
| parent | 8ec823cba166a41eb0e9e5ff8fe679e691fec678 (diff) | |
Revert "Allow adding extra tradefed options in the Android.bp file"
This reverts commit 8ec823cba166a41eb0e9e5ff8fe679e691fec678.
Reason for revert: DroidMonitor: Potential culprit for Bug b/262965953 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I236cc36981d8b30527ca286632727f8ca267e969
Diffstat (limited to 'rust/benchmark.go')
| -rw-r--r-- | rust/benchmark.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/rust/benchmark.go b/rust/benchmark.go index b417a2d65..0e842435d 100644 --- a/rust/benchmark.go +++ b/rust/benchmark.go @@ -112,14 +112,12 @@ func (benchmark *benchmarkDecorator) compilerProps() []interface{} { } func (benchmark *benchmarkDecorator) install(ctx ModuleContext) { - benchmark.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx). - SetTestConfigProp(benchmark.Properties.Test_config). - SetTestTemplateConfigProp(benchmark.Properties.Test_config_template). - SetTestSuites(benchmark.Properties.Test_suites). - SetAutoGenConfig(benchmark.Properties.Auto_gen_config). - SetDeviceTemplate("${RustDeviceBenchmarkConfigTemplate}"). - SetHostTemplate("${RustHostBenchmarkConfigTemplate}"). - Build() + benchmark.testConfig = tradefed.AutoGenRustBenchmarkConfig(ctx, + benchmark.Properties.Test_config, + benchmark.Properties.Test_config_template, + benchmark.Properties.Test_suites, + nil, + benchmark.Properties.Auto_gen_config) // default relative install path is module name if !Bool(benchmark.Properties.No_named_install_directory) { |