tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix quoting issues when generating build.ninja ." am: 51868f1577

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1622515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d4c49d33bbbd042deca6a9cb73c13efb73f6b2f
This commit is contained in:
Lukács T. Berki 2021-03-10 07:28:59 +00:00 committed by Automerger Merge Worker
commit 705d040fe7
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bootstrap/bootstrap.go
View file

@ -128,7 +128,23 @@ var (
// TODO: it's kinda ugly that some parameters are computed from
// environment variables and some from Ninja parameters, but it's probably
// better to not to touch that while Blueprint and Soong are separate
Command: "cd $$(dirname $builder) && BUILDER=$$PWD/$$(basename $builder) && cd / && env -i $$BUILDER $extra --top \"$$TOP\" --out \"$$SOONG_OUTDIR\" --delve_listen \"$$SOONG_DELVE\" --delve_path \"$$SOONG_DELVE_PATH\" -b $buildDir -n $ninjaBuildDir -d $out.d -globFile $globFile -o $out $in",
// NOTE: The spaces at EOL are important because otherwise Ninja would
// omit all spaces between the different options.
Command: `cd "$$(dirname "$builder")" && ` +
`BUILDER="$$PWD/$$(basename "$builder")" && ` +
`cd / && ` +
`env -i "$$BUILDER" ` +
` $extra ` +
` --top "$$TOP" ` +
` --out "$$SOONG_OUTDIR" ` +
` --delve_listen "$$SOONG_DELVE" ` +
` --delve_path "$$SOONG_DELVE_PATH" ` +
` -b "$buildDir" ` +
` -n "$ninjaBuildDir" ` +
` -d "$out.d" ` +
` -globFile "$globFile" ` +
` -o "$out" ` +
` "$in" `,
CommandDeps: []string{"$builder"},
Description: "$builder $out",
Deps: blueprint.DepsGCC,