StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sort jarjar rename keys before using" into main am: 688f824e1a

Browse Source 
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>
This commit is contained in:
Inseob Kim
2024-02-29 01:44:15 +00:00
committed by Automerger Merge Worker
parent 04338c8ae2 688f824e1a
commit 224ac62ba8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/base.go
View File

@@ -2408,7 +2408,8 @@ type JarJarProviderData struct {
func (this JarJarProviderData) GetDebugString() string { func (this JarJarProviderData) GetDebugString() string {
result := "" 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") { if strings.Contains(k, "android.companion.virtual.flags.FakeFeatureFlagsImpl") {
result += k + "--&gt;" + v + ";" result += k + "--&gt;" + 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. // to "" won't be in this list because they shouldn't be renamed yet.
func getJarJarRuleText(provider *JarJarProviderData) string { func getJarJarRuleText(provider *JarJarProviderData) string {
result := "" result := ""
for orig, renamed := range provider.Rename { for _, orig := range android.SortedKeys(provider.Rename) {
renamed := provider.Rename[orig]
if renamed != "" { if renamed != "" {
result += "rule " + orig + " " + renamed + "\n" result += "rule " + orig + " " + renamed + "\n"
} }