Fix queryview. am: 89071b08c7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I627aa12c63b1336c20493d280341f9760ceeeb78

android/queryview.go

@@ -67,10 +67,14 @@ func generateBuildActionsForBazelConversion(ctx SingletonContext, converterMode
 		blueprint.RuleParams{
 			Command: fmt.Sprintf(
 				"rm -rf ${outDir}/* && "+
-					"%s --bazel_queryview_dir ${outDir} %s && "+
+					"BUILDER=\"%s\" && "+
+					"cd $$(dirname \"$$BUILDER\") && "+
+					"ABSBUILDER=\"$$PWD/$$(basename \"$$BUILDER\")\" && "+
+					"cd / && "+
+					"env -i \"$$ABSBUILDER\" --bazel_queryview_dir ${outDir} \"%s\" && "+
 					"echo WORKSPACE: `cat %s` > ${outDir}/.queryview-depfile.d",
 				primaryBuilder.String(),
-				strings.Join(os.Args[1:], " "),
+				strings.Join(os.Args[1:], "\" \""),
 				moduleListFilePath.String(), // Use the contents of Android.bp.list as the depfile.
 			),
 			CommandDeps: []string{primaryBuilder.String()},