tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Relax check in moduleMatchingVariant

Browse source 
Pull request #317 made the equality check in moduleMatchingVariant
more correct by comparing the variant maps instead of the names.
Using only the names effectively ignores any variation with an
empty name.  Unfortuantely this broke a current user of
ReplaceDependenciesIf.  Go back to the relaxed check for now.

Test: build on a branch with sdk modules
Change-Id: I11016c8df7bd91fd022d04fd3033756f54d7fa0b
This commit is contained in:
Colin Cross 2020-09-11 19:22:27 -07:00
parent 277bac9904
commit edbdb8c2d3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
context.go
View file

@ -2733,7 +2733,7 @@ func (c *Context) moduleMatchingVariant(module *moduleInfo, name string) *module
} }
for _, m := range group.modules { for _, m := range group.modules {
if module.variant.variations.equal(m.moduleOrAliasVariant().variations) { if module.variant.name == m.moduleOrAliasVariant().name {
return m.moduleOrAliasTarget() return m.moduleOrAliasTarget()
} }
} }