diff options
| author | 2024-02-28 14:28:59 +0900 | |
|---|---|---|
| committer | 2024-02-28 14:28:59 +0900 | |
| commit | 3c0c9d781607beceffd842f12b8ed9623fefe08b (patch) | |
| tree | 27d942fc74e78c960e25496bbfd453d9fb636443 /java/base.go | |
| parent | 52e5e6b1a73c56837f3ae3398e41ee9d9badc7a5 (diff) | |
Sort jarjar rename keys before using
To make it deterministic
Bug: 327302642
Test: compare build commands among different targets
Change-Id: I890dcd67c62db58938a6e6d1c4e3fbd323c72b18
Diffstat (limited to 'java/base.go')
| -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" } |