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
diff --git a/mk2rbc/version_defaults.go b/mk2rbc/version_defaults.go
index 27e8198..64645d7 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 @@
"sort"
"strconv"
"strings"
+
+ mkparser "android/soong/androidmk/parser"
)
const codenamePrefix = "PLATFORM_VERSION_CODENAME."
@@ -97,7 +98,10 @@
strings.ToLower(name), genericValue(value)))
}
}
+
sort.Strings(lines)
+ sort.Strings(codenames)
+
sink.WriteString("version_defaults = struct(\n")
for _, l := range lines {
sink.WriteString(l)