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

Change jsonVariationMap to array of struct am: 8097d1a0e6 am: 465668494e am: b753906270

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

Change-Id: I8f7c098edb84a512d520618375c5832e9ac7d040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liz Kammer 2022-04-11 13:39:00 +00:00 committed by Automerger Merge Worker
commit 353186f043
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
context.go
View file

@ -2268,7 +2268,7 @@ func (c *Context) updateDependencies() (errs []error) {
return
}
type jsonVariationMap map[string]string
type jsonVariationMap []Variation
type jsonModuleName struct {
Name string
@ -2290,7 +2290,17 @@ type JsonModule struct {
}
func toJsonVariationMap(vm variationMap) jsonVariationMap {
return jsonVariationMap(vm)
m := make(jsonVariationMap, 0, len(vm))
for k, v := range vm {
m = append(m, Variation{k, v})
}
sort.Slice(m, func(i, j int) bool {
if m[i].Mutator != m[j].Mutator {
return m[i].Mutator < m[j].Mutator
}
return m[i].Variation < m[j].Variation
})
return m
}
func jsonModuleNameFromModuleInfo(m *moduleInfo) *jsonModuleName {