From 0cec5ea14647c8a890e866c3fabeb046b0510151 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 4 Jan 2023 11:24:28 -0800 Subject: [PATCH] Fix missing test name after aosp/2372150 The test name defaulting to ctx.ModuleName() was accidentally removed, readd it Bug: 184895128 Fixes: 264423240 Fixes: 264433459 Test: Verified ninja files produced with this cl and aosp/2372150 are the same as with aosp/2372150 reverted Change-Id: I23ab8ab39132b93719cc6f797d92b1cabce5eae9 --- tradefed/autogen.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tradefed/autogen.go b/tradefed/autogen.go index e93bac3ed..49b09afea 100644 --- a/tradefed/autogen.go +++ b/tradefed/autogen.go @@ -155,19 +155,23 @@ func AutoGenTestConfig(ctx android.ModuleContext, options AutoGenTestConfigOptio for _, c := range options.OptionsForAutogenerated { configs = append(configs, c) } + name := options.Name + if name == "" { + name = ctx.ModuleName() + } path, autogenPath := testConfigPath(ctx, options.TestConfigProp, options.TestSuites, options.AutoGenConfig, options.TestConfigTemplateProp) if autogenPath != nil { templatePath := getTestConfigTemplate(ctx, options.TestConfigTemplateProp) if templatePath.Valid() { - autogenTemplate(ctx, options.Name, autogenPath, templatePath.String(), configs, options.OutputFileName, options.TestInstallBase) + autogenTemplate(ctx, name, autogenPath, templatePath.String(), configs, options.OutputFileName, options.TestInstallBase) } else { if ctx.Device() { - autogenTemplate(ctx, options.Name, autogenPath, options.DeviceTemplate, configs, options.OutputFileName, options.TestInstallBase) + autogenTemplate(ctx, name, autogenPath, options.DeviceTemplate, configs, options.OutputFileName, options.TestInstallBase) } else { if Bool(options.UnitTest) { - autogenTemplate(ctx, options.Name, autogenPath, options.HostUnitTestTemplate, configs, options.OutputFileName, options.TestInstallBase) + autogenTemplate(ctx, name, autogenPath, options.HostUnitTestTemplate, configs, options.OutputFileName, options.TestInstallBase) } else { - autogenTemplate(ctx, options.Name, autogenPath, options.HostTemplate, configs, options.OutputFileName, options.TestInstallBase) + autogenTemplate(ctx, name, autogenPath, options.HostTemplate, configs, options.OutputFileName, options.TestInstallBase) } } }