Merge "Sort jarjar rename keys before using" into main (688f824e) · Commits · e / os / android_build_soong

java/base.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -2408,7 +2408,8 @@ type JarJarProviderData struct {

		func (this JarJarProviderData) GetDebugString() string {
		result := ""
		for k, v := range this.Rename {
		for _, k := range android.SortedKeys(this.Rename) {
		v := this.Rename[k]
		if strings.Contains(k, "android.companion.virtual.flags.FakeFeatureFlagsImpl") {
		result += k + "-->" + v + ";"
		}
		@@ -2664,7 +2665,8 @@ func (module Module) collectJarJarRules(ctx android.ModuleContext) JarJarProvi
		// to "" won't be in this list because they shouldn't be renamed yet.
		func getJarJarRuleText(provider *JarJarProviderData) string {
		result := ""
		for orig, renamed := range provider.Rename {
		for _, orig := range android.SortedKeys(provider.Rename) {
		renamed := provider.Rename[orig]
		if renamed != "" {
		result += "rule " + orig + " " + renamed + "\n"
		}