Apply toNinjaName for variant names am: a08e722192 am: 824c042a1c am: 413c480f6e

Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1927227

Change-Id: Ic197aea765c8e03bcaf1377c188c0ef5693d417f
This commit is contained in:
Yi Kong 2021-12-22 07:51:41 +00:00 committed by Automerger Merge Worker
commit fde2f48e77

View file

@ -2814,8 +2814,9 @@ func (c *Context) generateModuleBuildActions(config interface{},
func(module *moduleInfo, pause chan<- pauseSpec) bool {
uniqueName := c.nameInterface.UniqueName(newNamespaceContext(module), module.group.name)
sanitizedName := toNinjaName(uniqueName)
sanitizedVariant := toNinjaName(module.variant.name)
prefix := moduleNamespacePrefix(sanitizedName + "_" + module.variant.name)
prefix := moduleNamespacePrefix(sanitizedName + "_" + sanitizedVariant)
// The parent scope of the moduleContext's local scope gets overridden to be that of the
// calling Go package on a per-call basis. Since the initial parent scope doesn't matter we