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

Make debugging easier: am: 122b3ee153 am: 5506289b6d am: b89005d459

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I578d3f005894a8be05dfac118aba390014ca274f
This commit is contained in:
Lukacs T. Berki 2021-03-08 12:42:32 +00:00 committed by Automerger Merge Worker
commit 3992917a44
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap/bootstrap.go
View file

@ -128,7 +128,7 @@ var (
// TODO: it's kinda ugly that some parameters are computed from // TODO: it's kinda ugly that some parameters are computed from
// environment variables and some from Ninja parameters, but it's probably // environment variables and some from Ninja parameters, but it's probably
// better to not to touch that while Blueprint and Soong are separate // 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\" -b $buildDir -n $ninjaBuildDir -d $out.d -globFile $globFile -o $out $in", 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"}, CommandDeps: []string{"$builder"},
Description: "$builder $out", Description: "$builder $out",
Deps: blueprint.DepsGCC, Deps: blueprint.DepsGCC,

1
microfactory/microfactory.go
View file

@ -397,6 +397,7 @@ func (p *GoPackage) Compile(config *Config, outDir string) error {
fmt.Fprintln(hash, runtime.GOOS, runtime.GOARCH, goVersion) fmt.Fprintln(hash, runtime.GOOS, runtime.GOARCH, goVersion)
cmd := exec.Command(filepath.Join(goToolDir, "compile"), cmd := exec.Command(filepath.Join(goToolDir, "compile"),
"-N", "-l", // Disable optimization and inlining so that debugging works better
"-o", p.output, "-o", p.output,
"-p", p.Name, "-p", p.Name,
"-complete", "-pack", "-nolocalimports") "-complete", "-pack", "-nolocalimports")