Add variant name to module info
Without this, we cannot correctly join action and module graph information as we cannot distinguish variants on action graph. Test: m json-module-graph Change-Id: If7379845fc865d8a150f3995df6bf601456a71c3
This commit is contained in:
parent
82aa0ffb51
commit
6717f89de4
1 changed files with 4 additions and 1 deletions
|
@ -2679,6 +2679,7 @@ type jsonVariations []Variation
|
|||
|
||||
type jsonModuleName struct {
|
||||
Name string
|
||||
Variant string
|
||||
Variations jsonVariations
|
||||
DependencyVariations jsonVariations
|
||||
}
|
||||
|
@ -2714,6 +2715,7 @@ func toJsonVariationMap(vm variationMap) jsonVariations {
|
|||
func jsonModuleNameFromModuleInfo(m *moduleInfo) *jsonModuleName {
|
||||
return &jsonModuleName{
|
||||
Name: m.Name(),
|
||||
Variant: m.variant.name,
|
||||
Variations: toJsonVariationMap(m.variant.variations),
|
||||
DependencyVariations: toJsonVariationMap(m.variant.dependencyVariations),
|
||||
}
|
||||
|
@ -2762,6 +2764,7 @@ func jsonModuleWithActionsFromModuleInfo(m *moduleInfo) *JsonModule {
|
|||
result := &JsonModule{
|
||||
jsonModuleName: jsonModuleName{
|
||||
Name: m.Name(),
|
||||
Variant: m.variant.name,
|
||||
},
|
||||
Deps: make([]jsonDep, 0),
|
||||
Type: m.typeName,
|
||||
|
|
Loading…
Reference in a new issue