Merge "Make the names of 'soong_config_module_type_import' modules unique." into rvc-dev (a6ffd8b1) · Commits · e / os / android_build_soong

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