From 223e3ae1023a3faa030359aabacbadf0e2565034 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 6 Feb 2017 20:55:59 -0800 Subject: [PATCH] ui: Fix soong-executed ninja wrapping For proper ninja smart terminal support, we need to pass stdin to ./soong. Otherwise it starts a new line if the terminal isn't wide enough. Test: `rm -rf out/soong/.bootstrap; m -j` in narrow terminal Change-Id: I643a526001adc2323a420a03fa1df282554c7886 --- ui/build/soong.go | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/build/soong.go b/ui/build/soong.go index d017e7006..6554f1d8f 100644 --- a/ui/build/soong.go +++ b/ui/build/soong.go @@ -50,6 +50,7 @@ func runSoong(ctx Context, config Config) { env := config.Environment().Copy() env.Set("SKIP_NINJA", "true") cmd.Env = env.Environ() + cmd.Stdin = ctx.Stdin() cmd.Stdout = ctx.Stdout() cmd.Stderr = ctx.Stderr() ctx.Verboseln(cmd.Path, cmd.Args)