Merge "cosmetic changes"

	commonArgs = append(commonArgs, "-l", filepath.Join(config.FileListDir(), "Android.bp.list"))

	invocationEnv := make(map[string]string)

	debugMode := os.Getenv("SOONG_DELVE") != ""

	if debugMode {

	if os.Getenv("SOONG_DELVE") != "" {

		//debug mode

		commonArgs = append(commonArgs, "--delve_listen", os.Getenv("SOONG_DELVE"))

		commonArgs = append(commonArgs, "--delve_path", shared.ResolveDelveBinary())

		// GODEBUG=asyncpreemptoff=1 disables the preemption of goroutines. This

		invocationEnv["GODEBUG"] = "asyncpreemptoff=1"

	}

	allArgs := make([]string, 0, 0)

	var allArgs []string

	allArgs = append(allArgs, specificArgs...)

	allArgs = append(allArgs,

		"--globListDir", name,

func NewNinjaReader(ctx logger.Logger, status ToolStatus, fifo string) *NinjaReader {

	os.Remove(fifo)

	err := syscall.Mkfifo(fifo, 0666)

	if err != nil {

	if err := syscall.Mkfifo(fifo, 0666); err != nil {

		ctx.Fatalf("Failed to mkfifo(%q): %v", fifo, err)

	}