From b7fd37cb0824df399e0ba162714f24fa4265ef16 Mon Sep 17 00:00:00 2001 From: Stephen Crane Date: Thu, 11 Jun 2020 15:58:03 -0700 Subject: [PATCH] Fix module name when autogenerating test config c5b8749853890d973ca56f87262dc277b06bc984 broke specifying a name via the `autogenTemplateWithName` function by hard-coding `ctx.ModuleName()`. This restores that functionality. Bug: 158784626 Test: atest rustBinderTest_integration Change-Id: I05674e85defb363aa3cdf3e2dd895d1174e6b48f --- tradefed/autogen.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tradefed/autogen.go b/tradefed/autogen.go index 28291465b..b225edd4c 100644 --- a/tradefed/autogen.go +++ b/tradefed/autogen.go @@ -112,7 +112,7 @@ func autogenTemplate(ctx android.ModuleContext, output android.WritablePath, tem } func autogenTemplateWithName(ctx android.ModuleContext, name string, output android.WritablePath, template string, configs []Config) { - autogenTemplateWithNameAndOutputFile(ctx, ctx.ModuleName(), output, template, configs, "") + autogenTemplateWithNameAndOutputFile(ctx, name, output, template, configs, "") } func autogenTemplateWithNameAndOutputFile(ctx android.ModuleContext, name string, output android.WritablePath, template string, configs []Config, outputFileName string) {