diff options
| author | 2022-12-19 16:27:25 +0000 | |
|---|---|---|
| committer | 2022-12-19 16:27:25 +0000 | |
| commit | 77dc7d0839c53d76092e7b75ba3c3d4734542bbd (patch) | |
| tree | 1a4a81ebfdcb690ca78693761cd6ed33fb2e1caa /rust/test.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/test.go')
| -rw-r--r-- | rust/test.go | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/rust/test.go b/rust/test.go index ecc7d5d24..0cc3bca6e 100644 --- a/rust/test.go +++ b/rust/test.go @@ -130,16 +130,13 @@ func (test *testDecorator) install(ctx ModuleContext) { configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.RootTargetPreparer", options}) } - test.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx). - SetTestConfigProp(test.Properties.Test_config). - SetTestTemplateConfigProp(test.Properties.Test_config_template). - SetTestSuites(test.Properties.Test_suites). - SetConfig(configs). - SetAutoGenConfig(test.Properties.Auto_gen_config). - SetTestInstallBase(testInstallBase). - SetDeviceTemplate("${RustDeviceTestConfigTemplate}"). - SetHostTemplate("${RustHostTestConfigTemplate}"). - Build() + test.testConfig = tradefed.AutoGenRustTestConfig(ctx, + test.Properties.Test_config, + test.Properties.Test_config_template, + test.Properties.Test_suites, + configs, + test.Properties.Auto_gen_config, + testInstallBase) dataSrcPaths := android.PathsForModuleSrc(ctx, test.Properties.Data) |