StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-18 07:29:31 +00:00
committed by Gerrit Code Review
parent cdf399c40a 027366751d
commit 701a5d6faf
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/build/ninja.go
View File

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

3
ui/build/soong.go
View File

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