summaryrefslogtreecommitdiff
path: root/android/queryview.go
diff options
context:
space:
mode:
Diffstat (limited to 'android/queryview.go')
-rw-r--r--android/queryview.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/android/queryview.go b/android/queryview.go
index 9e3e45a32..b940202e0 100644
--- a/android/queryview.go
+++ b/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()},