Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa38c8c0 authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Sort jarjar rename keys before using" into main am: 688f824e am: 224ac62b 

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



Change-Id: I6e5a5fa9b8cd1bb49a0d90b9996838b4cf3669aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 693ba5cf 224ac62b

java/base.go

+4 −2
Original line number Diff line number Diff line
@@ -2413,7 +2413,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 + "--&gt;" + v + ";"

		}
@@ -2669,7 +2670,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"

		}