StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --kati_stats to cleanspec processing

Browse Source 
So that we can see where the time is going. Also removes the obsolete
ASAN_OPTIONS, which moved to kati, but I forgot to update this instance.

Test: m nothing; check out/soong.log
Change-Id: I0c4066bad20fc2dc22b389f4c973d10dca554ee3
This commit is contained in:
Dan Willemsen
2018-05-01 23:34:56 -07:00
parent d08726ac76
commit 81759847b2
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ui/build/kati.go
View File

@@ -197,6 +197,7 @@ func runKatiCleanSpec(ctx Context, config Config) {
"--werror_find_emulator", "--werror_find_emulator",
"--werror_overriding_commands", "--werror_overriding_commands",
"--use_find_emulator", "--use_find_emulator",
"--kati_stats",
"-f", "build/make/core/cleanbuild.mk", "-f", "build/make/core/cleanbuild.mk",
"BUILDING_WITH_NINJA=true", "BUILDING_WITH_NINJA=true",
"SOONG_MAKEVARS_MK=" + config.SoongMakeVarsMk(), "SOONG_MAKEVARS_MK=" + config.SoongMakeVarsMk(),
@@ -205,10 +206,13 @@ func runKatiCleanSpec(ctx Context, config Config) {
cmd := Command(ctx, config, "ckati", executable, args...) cmd := Command(ctx, config, "ckati", executable, args...)
cmd.Sandbox = katiCleanSpecSandbox cmd.Sandbox = katiCleanSpecSandbox
cmd.Stdout = ctx.Stdout() pipe, err := cmd.StdoutPipe()
cmd.Stderr = ctx.Stderr() if err != nil {
ctx.Fatalln("Error getting output pipe for ckati:", err)
}
cmd.Stderr = cmd.Stdout
// Kati leaks memory, so ensure leak detection is turned off cmd.StartOrFatal()
cmd.Environment.Set("ASAN_OPTIONS", "detect_leaks=0") katiRewriteOutput(ctx, pipe)
cmd.RunOrFatal() cmd.WaitOrFatal()
} }