diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-06-10 19:16:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-10 19:16:14 +0000 |
| commit | b6fd6f75f29a98a2fcc5fc3510d0f8a320f73870 (patch) | |
| tree | aa6ba8d3dbf6779b75648dc6e15238abadc9e21a /androidmk | |
| parent | 90ef4b9c1273250c0d3e65a835ff7856de8f4497 (diff) | |
| parent | 1a365c6a7f9f94c1125f50693aa7d18ae3caca4a (diff) | |
| download | build_soong-b6fd6f75f29a98a2fcc5fc3510d0f8a320f73870.tar.gz build_soong-b6fd6f75f29a98a2fcc5fc3510d0f8a320f73870.tar.bz2 build_soong-b6fd6f75f29a98a2fcc5fc3510d0f8a320f73870.zip | |
Merge "Clean up sortedKeys function"
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/Android.bp | 1 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/androidmk/Android.bp b/androidmk/Android.bp index 1d939b0c..79fe530d 100644 --- a/androidmk/Android.bp +++ b/androidmk/Android.bp @@ -30,6 +30,7 @@ blueprint_go_binary { "androidmk-parser", "blueprint-parser", "bpfix-lib", + "soong-android", ], } diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 24057af3..62aa3dc4 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -15,9 +15,9 @@ package main import ( + "android/soong/android" mkparser "android/soong/androidmk/parser" "fmt" - "sort" "strings" bpparser "github.com/google/blueprint/parser" @@ -335,15 +335,6 @@ func classifyLocalOrGlobalPath(value bpparser.Expression) (string, bpparser.Expr } } -func sortedMapKeys(inputMap map[string]string) (sortedKeys []string) { - keys := make([]string, 0, len(inputMap)) - for key := range inputMap { - keys = append(keys, key) - } - sort.Strings(keys) - return keys -} - // splitAndAssign splits a Make list into components and then // creates the corresponding variable assignments. func splitAndAssign(ctx variableAssignmentContext, splitFunc listSplitFunc, namesByClassification map[string]string) error { @@ -357,7 +348,7 @@ func splitAndAssign(ctx variableAssignmentContext, splitFunc listSplitFunc, name return err } - for _, nameClassification := range sortedMapKeys(namesByClassification) { + for _, nameClassification := range android.SortedStringKeys(namesByClassification) { name := namesByClassification[nameClassification] if component, ok := lists[nameClassification]; ok && !emptyList(component) { err = setVariable(ctx.file, ctx.append, ctx.prefix, name, component, true) |