From 984272b169ec146279fa57ccb0657c1c4c38b1f2 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 21 Oct 2021 15:01:56 -0700 Subject: [PATCH] Sort codenames in version_defaults.rbc Without the sort, the codenames were appearing in a random order. This was causing `go test` to flake. Test: go test Change-Id: Ieeb0677503d1521dc4b1aead09ea1ab7ea38b2ea --- mk2rbc/version_defaults.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mk2rbc/version_defaults.go b/mk2rbc/version_defaults.go index 27e8198a8..64645d761 100644 --- a/mk2rbc/version_defaults.go +++ b/mk2rbc/version_defaults.go @@ -15,7 +15,6 @@ package mk2rbc import ( - mkparser "android/soong/androidmk/parser" "bytes" "fmt" "io/ioutil" @@ -23,6 +22,8 @@ import ( "sort" "strconv" "strings" + + mkparser "android/soong/androidmk/parser" ) const codenamePrefix = "PLATFORM_VERSION_CODENAME." @@ -97,7 +98,10 @@ func VersionDefaults(values map[string]string) string { strings.ToLower(name), genericValue(value))) } } + sort.Strings(lines) + sort.Strings(codenames) + sink.WriteString("version_defaults = struct(\n") for _, l := range lines { sink.WriteString(l)