Merge "Make the names of 'soong_config_module_type_import' modules unique." into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-04-10 21:09:21 +00:00
committed by Android (Google) Code Review

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() {}