diff options
| author | Inseob Kim <inseob@google.com> | 2024-02-29 01:44:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 01:44:15 +0000 |
| commit | 224ac62ba87245f217dfe453637aa21a55acb9ed (patch) | |
| tree | dabbe5cfd3fa2a8df23e10c95a9dc625586407ff | |
| parent | 04338c8ae2dfa4453c8a2984f011a02cb1e60183 (diff) | |
| parent | 688f824e1a804c08a976f5502383ce1ec646177b (diff) | |
| download | soong-224ac62ba87245f217dfe453637aa21a55acb9ed.tar.gz | |
Merge "Sort jarjar rename keys before using" into main am: 688f824e1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2981731
Change-Id: I18ade8539893ac793663217f47c786e76f5a2aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | java/base.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/base.go b/java/base.go index 7f4ea08c7..2b499e2a5 100644 --- a/java/base.go +++ b/java/base.go @@ -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" } |