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
diff --git a/rust/benchmark.go b/rust/benchmark.go
index b417a2d..0e84243 100644
--- a/rust/benchmark.go
+++ b/rust/benchmark.go
@@ -112,14 +112,12 @@
}
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) {