Revert^2 "Initial implementation of the bazel sandwich"

c13fad8181 Change-Id: I478562c8fd89e62983feb5b52b62aad851d40f00
2023-08-01 16:38:55 +00:00
parent 09195f4ffd
commit bc65a3fea8
8 changed files with 328 additions and 14 deletions
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -121,6 +121,10 @@ func runMixedModeBuild(ctx *android.Context, extraNinjaDeps []string) string {
 	defer ctx.EventHandler.End("mixed_build")

 	bazelHook := func() error {
+		err := ctx.Config().BazelContext.QueueBazelSandwichCqueryRequests(ctx.Config())
+		if err != nil {
+			return err
+		}
 		return ctx.Config().BazelContext.InvokeBazel(ctx.Config(), ctx)
 	}
 	ctx.SetBeforePrepareBuildActionsHook(bazelHook)