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

Merge "Use common helper functions for getting sorted map keys." am: 49b1e9b6ce am: d972866eb5 am: 9f3062747a am: 4334875793 am: 6f53dedf85

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404519

Change-Id: I6dcb6c6e271802ce91ded52c3b2e689dcb3d671d
This commit is contained in:
Ulyana Trafimovich
2020-08-21 11:26:47 +00:00
committed by Automerger Merge Worker
parent d1fa0cf81f 6f53dedf85
commit 03c201fe18
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/androidmk.go
View File

@@ -121,7 +121,7 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries {
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()...)

2
java/java_test.go
View File

@@ -1495,7 +1495,7 @@ func TestJavaSdkLibrary(t *testing.T) {
// test if baz has exported SDK lib names foo and bar to qux
qux := ctx.ModuleForTests("qux", "android_common")
if quxLib, ok := qux.Module().(*Library); ok {
sdkLibs := quxLib.ExportedSdkLibs().Names()
sdkLibs := android.SortedStringKeys(quxLib.ExportedSdkLibs())
if w := []string{"bar", "foo", "fred", "quuz"}; !reflect.DeepEqual(w, sdkLibs) {
t.Errorf("qux should export %q but exports %q", w, sdkLibs)
}