From 227e745e5676876d1a079f21666a7e62f7debeb2 Mon Sep 17 00:00:00 2001 From: satayev Date: Thu, 20 May 2021 21:35:06 +0100 Subject: Rename generate proto config file to match classpath type. There is no need to leak soong module names. Bug: 180105615 Test: m && launch_cvd; atest CtsClasspathsTestCases Change-Id: I04f4e181d2f42b9d71641980a2c7c4e8cbc8e426 --- java/classpath_fragment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/classpath_fragment.go') diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index bc0416a47..0e14d24f2 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -105,7 +105,7 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars } func (c *ClasspathFragmentBase) generateClasspathProtoBuildActions(ctx android.ModuleContext, jars []classpathJar) { - outputFilename := ctx.ModuleName() + ".pb" + outputFilename := strings.ToLower(c.classpathType.String()) + ".pb" c.outputFilepath = android.PathForModuleOut(ctx, outputFilename).OutputPath c.installDirPath = android.PathForModuleInstall(ctx, "etc", "classpaths") -- cgit v1.2.3-59-g8ed1b