commit 66ffdb74ee1350f491590c6b28476b8c674c39f7
author Liz Kammer <eakammer@google.com> Fri Apr 02 13:26:07 2021 -0400
committer Liz Kammer <eakammer@google.com> Mon Apr 05 10:41:05 2021 -0400
tree 98af24b1922383b8ed15796f865dfa071c3de382
parent 0202caa0fd8917468459a1b7d0a85206de492490

Only include used requests in cquery starlark

Test: go test soong tests
Test: generate & sync bp2build, mixed build libc
Change-Id: I1fbf854cf31f40b7721788956d0f08da3bda2cba

android/bazel_handler.go

diff --git a/android/bazel_handler.go b/android/bazel_handler.go
index 3037121..96a8132 100644
--- a/android/bazel_handler.go
+++ b/android/bazel_handler.go
@@ -474,7 +474,7 @@
     return id_string + ">>" + %s(target)
 `
 
-	for _, requestType := range cquery.RequestTypes {
+	for requestType, _ := range requestTypeToCqueryIdEntries {
 		labelMapName := requestType.Name() + "_Labels"
 		functionName := requestType.Name() + "_Fn"
 		labelRegistrationMapSection += fmt.Sprintf(mapDeclarationFormatString,