Merge "Use --frontend_file for ninja instead of cat"

am: 701a5d6faf

Change-Id: I571a9e53a75e7761724658136eeed0c755b1be7d
This commit is contained in:
Dan Willemsen
2018-07-18 00:37:17 -07:00
committed by android-build-merger
2 changed files with 2 additions and 3 deletions

View File

@@ -35,7 +35,7 @@ func runNinja(ctx Context, config Config) {
executable := config.PrebuiltBuildTool("ninja")
args := []string{
"-d", "keepdepfile",
fmt.Sprintf("--frontend=cat <&3 >%s", fifo),
"--frontend_file", fifo,
}
args = append(args, config.NinjaArgs()...)

View File

@@ -15,7 +15,6 @@
package build
import (
"fmt"
"os"
"path/filepath"
"strconv"
@@ -116,7 +115,7 @@ func runSoong(ctx Context, config Config) {
"-d", "keepdepfile",
"-w", "dupbuild=err",
"-j", strconv.Itoa(config.Parallel()),
fmt.Sprintf("--frontend=cat <&3 >%s", fifo),
"--frontend_file", fifo,
"-f", filepath.Join(config.SoongOutDir(), file))
cmd.Sandbox = soongSandbox
cmd.RunAndPrintOrFatal()