| commit | 979cb7d6ba5242f296f948f8c1cb29b360007183 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Oct 21 23:53:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 21 23:53:13 2021 +0000 |
| tree | 25a3f70f5a51bf44c452d8474c0c23c31bbabc43 | |
| parent | 3148f72c42e574c2c6336f37b1f6568d447aca0a [diff] | |
| parent | 139fd3655b088bcda7ffe4efdab717a41c02ecab [diff] |
Merge "Sort codenames in version_defaults.rbc" am: 139fd3655b Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1867225 Change-Id: I8de0e68f27f0d3e8c24238030b47ed9a46e9cf1d
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)