Quote aquery commands.

Bazel run shell actions begin `bin/bash -c <command>`, without escaping, the command can be treated as an argument to `bin/bash`. Test: build/bazel/mixed_droid.sh Change-Id: I423cb393da2e6ac97448ec77b2596f12670dfd31
2021-11-16 17:01:11 -05:00
parent ddeab21340
commit c31929962b
3 changed files with 7 additions and 4 deletions
--- a/bazel/aquery.go
+++ b/bazel/aquery.go
@@ -271,7 +271,7 @@ func AqueryBuildStatements(aqueryJsonProto []byte) ([]BuildStatement, error) {
 		}

 		buildStatement := BuildStatement{
-			Command:     strings.Join(proptools.ShellEscapeList(actionEntry.Arguments), " "),
+			Command:     strings.Join(proptools.ShellEscapeListIncludingSpaces(actionEntry.Arguments), " "),
 			Depfile:     depfile,
 			OutputPaths: outputPaths,
 			InputPaths:  inputPaths,