Merge "Make the names of 'soong_config_module_type_import' modules unique."

This commit is contained in:
Treehugger Robot 2020-04-08 17:39:42 +00:00 committed by Gerrit Code Review
commit 9e06bb64ca
1 changed files with 4 additions and 1 deletions

View File

@ -122,7 +122,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() {}