Merge "Sort codenames in version_defaults.rbc" am: 139fd3655b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1867225

Change-Id: I8de0e68f27f0d3e8c24238030b47ed9a46e9cf1d

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)