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

Merge "Add variant name to module info" am: a85a30c611 am: 0dbf7c740f am: b1b9cbc149 am: 10b9f13f96

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2526240

Change-Id: I81227f492f78e50c484d223cf6980f65faf60548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-04-07 19:36:29 +00:00 committed by Automerger Merge Worker
commit 3812773ddc
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
context.go
View file

@ -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),
}
@ -2761,7 +2763,8 @@ func jsonModuleFromModuleInfo(m *moduleInfo) *JsonModule {
func jsonModuleWithActionsFromModuleInfo(m *moduleInfo) *JsonModule {
result := &JsonModule{
jsonModuleName: jsonModuleName{
Name: m.Name(),
Name: m.Name(),
Variant: m.variant.name,
},
Deps: make([]jsonDep, 0),
Type: m.typeName,