diff options
| author | Tahsin Loqman <tahsinl@google.com> | 2022-12-19 16:27:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-12-19 16:27:25 +0000 |
| commit | 77dc7d0839c53d76092e7b75ba3c3d4734542bbd (patch) | |
| tree | 1a4a81ebfdcb690ca78693761cd6ed33fb2e1caa /sh | |
| parent | 8ec823cba166a41eb0e9e5ff8fe679e691fec678 (diff) | |
| download | soong-77dc7d0839c53d76092e7b75ba3c3d4734542bbd.tar.gz | |
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 'sh')
| -rw-r--r-- | sh/sh_binary.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 4eae397a6..96273297a 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -379,16 +379,8 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { } configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.PushFilePreparer", options}) } - s.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx). - SetTestConfigProp(s.testProperties.Test_config). - SetTestTemplateConfigProp(s.testProperties.Test_config_template). - SetTestSuites(s.testProperties.Test_suites). - SetConfig(configs). - SetAutoGenConfig(s.testProperties.Auto_gen_config). - SetOutputFileName(s.outputFilePath.Base()). - SetDeviceTemplate("${ShellTestConfigTemplate}"). - SetHostTemplate("${ShellTestConfigTemplate}"). - Build() + s.testConfig = tradefed.AutoGenShellTestConfig(ctx, s.testProperties.Test_config, + s.testProperties.Test_config_template, s.testProperties.Test_suites, configs, s.testProperties.Auto_gen_config, s.outputFilePath.Base()) s.dataModules = make(map[string]android.Path) ctx.VisitDirectDeps(func(dep android.Module) { |