Merge "Remove unnecessary variable" (98bb2768) · Commits · e / os / android_build_soong

tradefed/autogen.go

+4 −5

Original line number	Diff line number	Diff line
		@@ -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)
		}
		}
		}