From 38851d86aad9cf7e0f722c368a48ea79194bc717 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Wed, 15 Mar 2023 00:19:32 -0400 Subject: [PATCH] Make buildroot.cquery determinisitc Test: determinism_test.sh Change-Id: Ia80dc425a781247f518ace8a5d11b49cd1ae60ce --- android/bazel_handler.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/bazel_handler.go b/android/bazel_handler.go index e7ff08f72..3c5e80f49 100644 --- a/android/bazel_handler.go +++ b/android/bazel_handler.go @@ -946,9 +946,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) } @@ -970,7 +974,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,