tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I326d647e8caebed479640bd0240d2c90a68e876a
This commit is contained in:
Yi Kong 2021-12-22 08:04:45 +00:00 committed by Automerger Merge Worker
commit ce12e80e7e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
context.go
View file

@ -2814,8 +2814,9 @@ func (c *Context) generateModuleBuildActions(config interface{},
func(module *moduleInfo, pause chan<- pauseSpec) bool { func(module *moduleInfo, pause chan<- pauseSpec) bool {
uniqueName := c.nameInterface.UniqueName(newNamespaceContext(module), module.group.name) uniqueName := c.nameInterface.UniqueName(newNamespaceContext(module), module.group.name)
sanitizedName := toNinjaName(uniqueName) 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 // 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 // calling Go package on a per-call basis. Since the initial parent scope doesn't matter we