diff options
| -rw-r--r-- | android/bazel_handler.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/android/bazel_handler.go b/android/bazel_handler.go index 44dc0559e..5c429e21d 100644 --- a/android/bazel_handler.go +++ b/android/bazel_handler.go @@ -960,9 +960,13 @@ func indent(original string) string { // request type. func (context *mixedBuildBazelContext) cqueryStarlarkFileContents() []byte { requestTypeToCqueryIdEntries := map[cqueryRequest][]string{} + requestTypes := []cqueryRequest{} for _, val := range context.requests { cqueryId := getCqueryId(val) mapEntryString := fmt.Sprintf("%q : True", cqueryId) + if _, seenKey := requestTypeToCqueryIdEntries[val.requestType]; !seenKey { + requestTypes = append(requestTypes, val.requestType) + } requestTypeToCqueryIdEntries[val.requestType] = append(requestTypeToCqueryIdEntries[val.requestType], mapEntryString) } @@ -984,7 +988,7 @@ def %s(target, id_string): return id_string + ">>" + %s(target, id_string) ` - for requestType := range requestTypeToCqueryIdEntries { + for _, requestType := range requestTypes { labelMapName := requestType.Name() + "_Labels" functionName := requestType.Name() + "_Fn" labelRegistrationMapSection += fmt.Sprintf(mapDeclarationFormatString, |