From d2c7ddc82a40e1c6fabb18d58c501639e3b91513 Mon Sep 17 00:00:00 2001
From: Ulya Trafimovich <skvadrik@google.com>
Date: Thu, 3 Sep 2020 15:52:01 +0100
Subject: [PATCH] Iterate <uses-library> in deterministic order in
 manifest_fixer.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: Ideb7e0f7beae8c80561f841b8ce9129003f1aa96
---
 java/android_manifest.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/android_manifest.go b/java/android_manifest.go
index f45ebe8d5..41fcafe0c 100644
--- 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 {