StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort codenames in version_defaults.rbc

Browse Source 
Without the sort, the codenames were appearing in a random order.
This was causing `go test` to flake.

Test: go test
Change-Id: Ieeb0677503d1521dc4b1aead09ea1ab7ea38b2ea
This commit is contained in:
Cole Faust
2021-10-21 15:01:56 -07:00
parent c0ed1f653f
commit 984272b169
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mk2rbc/version_defaults.go
View File

@@ -15,7 +15,6 @@
package mk2rbc package mk2rbc
import ( import (
mkparser "android/soong/androidmk/parser"
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
@@ -23,6 +22,8 @@ import (
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
mkparser "android/soong/androidmk/parser"
) )
const codenamePrefix = "PLATFORM_VERSION_CODENAME." const codenamePrefix = "PLATFORM_VERSION_CODENAME."
@@ -97,7 +98,10 @@ func VersionDefaults(values map[string]string) string {
strings.ToLower(name), genericValue(value))) strings.ToLower(name), genericValue(value)))
} }
} }
sort.Strings(lines) sort.Strings(lines)
sort.Strings(codenames)
sink.WriteString("version_defaults = struct(\n") sink.WriteString("version_defaults = struct(\n")
for _, l := range lines { for _, l := range lines {
sink.WriteString(l) sink.WriteString(l)