Commit d9429e6f authored Mar 06, 2018 by Dan Willemsen

Handle Scanner errors in kati output filter

If Kati ever wrote a line over 64k characters, the scanner in soong_ui
would error, and Kati would hang trying to write into the pipe. Now if
the Scanner errors out, fall back to copying directly from the pipe to
the output.

Test: Add $(warning $(shell find frameworks)), does not hang
Change-Id: I86412ad2f53f2fe3cbda901ee673abb904d56d3c

parent fd4795f5

ui/build/kati.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,11 @@ func katiRewriteOutput(ctx Context, pipe io.ReadCloser) {
		if !haveBlankLine {
		fmt.Fprintln(ctx.Stdout())
		}

		if err := scanner.Err(); err != nil {
		ctx.Println("Error from kati parser:", err)
		io.Copy(ctx.Stderr(), pipe)
		}
		}

		func runKatiCleanSpec(ctx Context, config Config) {