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

Merge "Turn on ninja phony outputs"

Browse Source
This commit is contained in:
Treehugger Robot
2020-04-21 22:30:24 +00:00
committed by Gerrit Code Review
parent aa52a04fdd 6587beddfa
commit 9145d847e4
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ui/build/build.go
View File

@@ -53,7 +53,6 @@ builddir = {{.OutDir}}
{{end -}} {{end -}}
pool highmem_pool pool highmem_pool
depth = {{.HighmemParallel}} depth = {{.HighmemParallel}}
build _kati_always_build_: phony
{{if .HasKatiSuffix}}subninja {{.KatiBuildNinjaFile}} {{if .HasKatiSuffix}}subninja {{.KatiBuildNinjaFile}}
subninja {{.KatiPackageNinjaFile}} subninja {{.KatiPackageNinjaFile}}
{{end -}} {{end -}}

1
ui/build/kati.go
View File

@@ -67,6 +67,7 @@ func runKati(ctx Context, config Config, extraSuffix string, args []string, envF
"--ninja_dir=" + config.OutDir(), "--ninja_dir=" + config.OutDir(),
"--ninja_suffix=" + config.KatiSuffix() + extraSuffix, "--ninja_suffix=" + config.KatiSuffix() + extraSuffix,
"--no_ninja_prelude", "--no_ninja_prelude",
"--use_ninja_phony_output",
"--regen", "--regen",
"--ignore_optional_include=" + filepath.Join(config.OutDir(), "%.P"), "--ignore_optional_include=" + filepath.Join(config.OutDir(), "%.P"),
"--detect_android_echo", "--detect_android_echo",

1
ui/build/ninja.go
View File

@@ -58,6 +58,7 @@ func runNinja(ctx Context, config Config) {
args = append(args, "-f", config.CombinedNinjaFile()) args = append(args, "-f", config.CombinedNinjaFile())
args = append(args, args = append(args,
"-o", "usesphonyoutputs=yes",
"-w", "dupbuild=err", "-w", "dupbuild=err",
"-w", "missingdepfile=err") "-w", "missingdepfile=err")

4
ui/build/soong.go
View File

@@ -119,7 +119,11 @@ func runSoong(ctx Context, config Config) {
cmd := Command(ctx, config, "soong "+name, cmd := Command(ctx, config, "soong "+name,
config.PrebuiltBuildTool("ninja"), config.PrebuiltBuildTool("ninja"),
"-d", "keepdepfile", "-d", "keepdepfile",
"-o", "usesphonyoutputs=yes",
"-o", "preremoveoutputs=yes",
"-w", "dupbuild=err", "-w", "dupbuild=err",
"-w", "outputdir=err",
"-w", "missingoutfile=err",
"-j", strconv.Itoa(config.Parallel()), "-j", strconv.Itoa(config.Parallel()),
"--frontend_file", fifo, "--frontend_file", fifo,
"-f", filepath.Join(config.SoongOutDir(), file)) "-f", filepath.Join(config.SoongOutDir(), file))