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

Merge "Make buildroot.cquery determinisitc"

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-12 21:04:52 +00:00
committed by Gerrit Code Review
parent 2a1de1bfe6 38851d86aa
commit 7a9626c655
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. // request type.
func (context *mixedBuildBazelContext) cqueryStarlarkFileContents() []byte { func (context *mixedBuildBazelContext) cqueryStarlarkFileContents() []byte {
requestTypeToCqueryIdEntries := map[cqueryRequest][]string{} requestTypeToCqueryIdEntries := map[cqueryRequest][]string{}
requestTypes := []cqueryRequest{}
for _, val := range context.requests { for _, val := range context.requests {
cqueryId := getCqueryId(val) cqueryId := getCqueryId(val)
mapEntryString := fmt.Sprintf("%q : True", cqueryId) mapEntryString := fmt.Sprintf("%q : True", cqueryId)
if _, seenKey := requestTypeToCqueryIdEntries[val.requestType]; !seenKey {
requestTypes = append(requestTypes, val.requestType)
}
requestTypeToCqueryIdEntries[val.requestType] = requestTypeToCqueryIdEntries[val.requestType] =
append(requestTypeToCqueryIdEntries[val.requestType], mapEntryString) append(requestTypeToCqueryIdEntries[val.requestType], mapEntryString)
} }
@@ -984,7 +988,7 @@ def %s(target, id_string):
return id_string + ">>" + %s(target, id_string) return id_string + ">>" + %s(target, id_string)
` `
for requestType := range requestTypeToCqueryIdEntries { for _, requestType := range requestTypes {
labelMapName := requestType.Name() + "_Labels" labelMapName := requestType.Name() + "_Labels"
functionName := requestType.Name() + "_Fn" functionName := requestType.Name() + "_Fn"
labelRegistrationMapSection += fmt.Sprintf(mapDeclarationFormatString, labelRegistrationMapSection += fmt.Sprintf(mapDeclarationFormatString,