diff options
| -rw-r--r-- | tradefed/autogen.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tradefed/autogen.go b/tradefed/autogen.go index 3c55c51e1..ddd0a800c 100644 --- a/tradefed/autogen.go +++ b/tradefed/autogen.go @@ -167,7 +167,6 @@ func AutoGenTestConfig(ctx android.ModuleContext, options AutoGenTestConfigOptio for _, c := range options.OptionsForAutogenerated { configs = append(configs, c) } - testRunnerConfigs := append([]Option{}, options.TestRunnerOptions...) name := options.Name if name == "" { name = ctx.ModuleName() @@ -176,15 +175,15 @@ func AutoGenTestConfig(ctx android.ModuleContext, options AutoGenTestConfigOptio if autogenPath != nil { templatePath := getTestConfigTemplate(ctx, options.TestConfigTemplateProp) if templatePath.Valid() { - autogenTemplate(ctx, name, autogenPath, templatePath.String(), configs, testRunnerConfigs, options.OutputFileName, options.TestInstallBase) + autogenTemplate(ctx, name, autogenPath, templatePath.String(), configs, options.TestRunnerOptions, options.OutputFileName, options.TestInstallBase) } else { if ctx.Device() { - autogenTemplate(ctx, name, autogenPath, options.DeviceTemplate, configs, testRunnerConfigs, options.OutputFileName, options.TestInstallBase) + autogenTemplate(ctx, name, autogenPath, options.DeviceTemplate, configs, options.TestRunnerOptions, options.OutputFileName, options.TestInstallBase) } else { if Bool(options.UnitTest) { - autogenTemplate(ctx, name, autogenPath, options.HostUnitTestTemplate, configs, testRunnerConfigs, options.OutputFileName, options.TestInstallBase) + autogenTemplate(ctx, name, autogenPath, options.HostUnitTestTemplate, configs, options.TestRunnerOptions, options.OutputFileName, options.TestInstallBase) } else { - autogenTemplate(ctx, name, autogenPath, options.HostTemplate, configs, testRunnerConfigs, options.OutputFileName, options.TestInstallBase) + autogenTemplate(ctx, name, autogenPath, options.HostTemplate, configs, options.TestRunnerOptions, options.OutputFileName, options.TestInstallBase) } } } |