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

Merge "Make buildroot.cquery determinisitc" am: 7a9626c655 am: 29fb9ead5c

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

Change-Id: Ibf584dd92304db1e99bde63248f6fda0a3f27334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-12 21:43:29 +00:00
committed by Automerger Merge Worker
parent d090c16d92 29fb9ead5c
commit 177d8ca6b0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/bazel_handler.go
View File

@@ -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,