Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81759847 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Add --kati_stats to cleanspec processing

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
parent d08726ac
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ func runKatiCleanSpec(ctx Context, config Config) {
		"--werror_find_emulator",
		"--werror_overriding_commands",
		"--use_find_emulator",
		"--kati_stats",
		"-f", "build/make/core/cleanbuild.mk",
		"BUILDING_WITH_NINJA=true",
		"SOONG_MAKEVARS_MK=" + config.SoongMakeVarsMk(),
@@ -205,10 +206,13 @@ func runKatiCleanSpec(ctx Context, config Config) {

	cmd := Command(ctx, config, "ckati", executable, args...)
	cmd.Sandbox = katiCleanSpecSandbox
	cmd.Stdout = ctx.Stdout()
	cmd.Stderr = ctx.Stderr()
	pipe, err := cmd.StdoutPipe()
	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.Environment.Set("ASAN_OPTIONS", "detect_leaks=0")
	cmd.RunOrFatal()
	cmd.StartOrFatal()
	katiRewriteOutput(ctx, pipe)
	cmd.WaitOrFatal()
}