commit b8063c6a86b46ca5f4cb3f35d25c846ea6647d91
author Ulya Trafimovich <skvadrik@google.com> Thu Aug 20 11:33:12 2020 +0100
committer Ulya Trafimovich <skvadrik@google.com> Thu Aug 20 12:37:03 2020 +0100
tree be273efbf9c59f12a34c2d2ec7b0ef9a73c68652
parent 9ce22217915c9fa3da6a23634e83f24705417cd1

Use common helper functions for getting sorted map keys.

Add a new helper SortedIntKeys similar to SortedStringKeys.

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I08a43ec2cae7d1a82531295aca1a0658e3a0dd6f

java/androidmk.go

diff --git a/java/androidmk.go b/java/androidmk.go
index 144268f..b1582d9 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -121,7 +121,7 @@
 						entries.SetPath("LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR", library.jacocoReportClassesFile)
 					}
 
-					entries.AddStrings("LOCAL_EXPORT_SDK_LIBRARIES", library.exportedSdkLibs.Names()...)
+					entries.AddStrings("LOCAL_EXPORT_SDK_LIBRARIES", android.SortedStringKeys(library.exportedSdkLibs)...)
 
 					if len(library.additionalCheckedModules) != 0 {
 						entries.AddStrings("LOCAL_ADDITIONAL_CHECKED_MODULE", library.additionalCheckedModules.Strings()...)