Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 227d5675 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

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
Merged-In: I6782e42c129dc3b0fc7649ce97d5f94effc63fa7
parent 18831265

android/soong_config_modules.go

+4 −1
Original line number Diff line number Diff line
@@ -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()                                 {}