diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-04-12 21:59:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-12 21:59:51 +0000 |
| commit | 72f65f9e6e1611e7c4a6adc52077c7c4de11fe58 (patch) | |
| tree | 3eafa0e7b4b0574594e012edc04e25a742011465 /android | |
| parent | a6784dd6979c7934575002885f6f48dabb03c28d (diff) | |
| parent | 177d8ca6b080a97ab35494c33e7d3dc1a00f96a7 (diff) | |
| download | soong-72f65f9e6e1611e7c4a6adc52077c7c4de11fe58.tar.gz | |
Merge "Make buildroot.cquery determinisitc" am: 7a9626c655 am: 29fb9ead5c am: 177d8ca6b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488996
Change-Id: I99697638b2c1eda9ceb6e8de103d9d4c5332206d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android')
| -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, |