openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make the names of 'soong_config_module_type_import' modules unique. 

blueprint.writeAllModuleActions attemts to sort modules by name, and
sorting them assumes that each module's name is unique. Although
soong_config_module_type_import modules will not generate anything,
their names should be unique, too for that reason.

Fixes: 150421585
Test: m nothing
Change-Id: I6782e42c129dc3b0fc7649ce97d5f94effc63fa7
This commit is contained in:
Sasha Smundak 2020-03-10 16:10:06 -07:00 committed by Alexander Smundak
parent 20d854948b
commit 116ec92e0e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/soong_config_modules.go
View File

@ -125,7 +125,10 @@ func soongConfigModuleTypeImportFactory() Module {
}
func (m *soongConfigModuleTypeImport) Name() string {
return "soong_config_module_type_import_" + soongconfig.CanonicalizeToProperty(m.properties.From)
// The generated name is non-deterministic, but it does not
// matter because this module does not emit any rules.
return soongconfig.CanonicalizeToProperty(m.properties.From) +
"soong_config_module_type_import_" + fmt.Sprintf("%p", m)
}
func (*soongConfigModuleTypeImport) Nameless() {}