Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49 am: da55e8208f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533 Change-Id: Icd116d796253e1062d0cc28c985becf03bd30238
2020-09-04 01:35:10 +00:00
parent cc4fb483cb da55e8208f
commit e124bd97d9
1 changed files with 1 additions and 1 deletions
--- a/java/android_manifest.go
+++ b/java/android_manifest.go
@@ -80,7 +80,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext
 		args = append(args, "--use-embedded-dex")
 	}

-	for usesLib, _ := range sdkLibraries {
+	for _, usesLib := range android.SortedStringKeys(sdkLibraries) {
 		if inList(usesLib, optionalUsesLibs) {
 			args = append(args, "--optional-uses-library", usesLib)
 		} else {