diff options
| author | 2021-03-08 13:02:10 +0100 | |
|---|---|---|
| committer | 2021-03-08 13:05:20 +0100 | |
| commit | 89071b08c7c28a879a61200e11f5e890160ece26 (patch) | |
| tree | 38a9e4c7ac2ac723f0e3dae754851b84612967e6 | |
| parent | 921a89e376a6717b04e0ac6756e3c587bb90fa0f (diff) | |
Fix queryview.
This got broken by aosp/1610785 which changed the assumptions
soong_build makes about its environment.
At that time, I didn't know that queryview also invokes soong_build
through another pathway.
Test: Manual: "m queryview && m nothing"
Change-Id: I06ed42aee0d97e18f634eeeaca37108009b29d78
| -rw-r--r-- | android/queryview.go | 8 |
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()}, |