StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary variable

Browse Source 
Bug: 284179405
Test: m
Change-Id: I1b5b2559837d27e8e380bb700b2b7ad674d8b079
This commit is contained in:
Dan Shi
2023-06-15 22:58:49 +00:00
parent 886cd6d6e9
commit 9b4835c360
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tradefed/autogen.go
View File

@@ -167,7 +167,6 @@ func AutoGenTestConfig(ctx android.ModuleContext, options AutoGenTestConfigOptio
for _, c := range options.OptionsForAutogenerated { for _, c := range options.OptionsForAutogenerated {
configs = append(configs, c) configs = append(configs, c)
} }
testRunnerConfigs := append([]Option{}, options.TestRunnerOptions...)
name := options.Name name := options.Name
if name == "" { if name == "" {
name = ctx.ModuleName() name = ctx.ModuleName()
@@ -176,15 +175,15 @@ func AutoGenTestConfig(ctx android.ModuleContext, options AutoGenTestConfigOptio
if autogenPath != nil { if autogenPath != nil {
templatePath := getTestConfigTemplate(ctx, options.TestConfigTemplateProp) templatePath := getTestConfigTemplate(ctx, options.TestConfigTemplateProp)
if templatePath.Valid() { 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 { } else {
if ctx.Device() { 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 { } else {
if Bool(options.UnitTest) { 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 { } 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)
} }
} }
} }