Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0acd2710 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary variable" am: 98bb2768 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2628590



Change-Id: Ia9da45204dddb35ccb0cc60b69cfc40d339e928d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1a30716 98bb2768

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)

				}

			}

		}