aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-02-06 20:55:59 -0800
committerDan Willemsen <dwillemsen@google.com>2017-02-06 20:59:11 -0800
commit223e3ae1023a3faa030359aabacbadf0e2565034 (patch)
treedcddf9fd39383fff5f24fb51ade72433f545a6cd /ui
parentd9f6fa28d681de1051adcddb5aef293e02bcc60e (diff)
downloadbuild_soong-223e3ae1023a3faa030359aabacbadf0e2565034.tar.gz
build_soong-223e3ae1023a3faa030359aabacbadf0e2565034.tar.bz2
build_soong-223e3ae1023a3faa030359aabacbadf0e2565034.zip
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
Diffstat (limited to 'ui')
-rw-r--r--ui/build/soong.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/build/soong.go b/ui/build/soong.go
index d017e700..6554f1d8 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)