diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-02-24 10:53:23 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-02-24 10:53:23 -0800 |
| commit | c38d366d787511506c227b63d873d643a150e3da (patch) | |
| tree | fb2ca4d211b90dd8420a967dd75a65aa02960e6f | |
| parent | 9383f82428131f638ba312fae11b4452d4ae0036 (diff) | |
| download | build_soong-c38d366d787511506c227b63d873d643a150e3da.tar.gz build_soong-c38d366d787511506c227b63d873d643a150e3da.tar.bz2 build_soong-c38d366d787511506c227b63d873d643a150e3da.zip | |
Updates for the new ckati drop
We can start removing out directories again in multiproduct_kati, since
the opendir bug has been fixed.
Add --color_warnings to the Kati command line. Since this is different
from Make, take this opportunity to reorder the command line to make
more sense. This wasn't done before because kati forces a regen whenever
the command line changes.
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I5ad03359fbc16db482722946202297c1ae0f2b90
| -rw-r--r-- | cmd/multiproduct_kati/main.go | 3 | ||||
| -rw-r--r-- | ui/build/kati.go | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go index 21d83834..d52c1692 100644 --- a/cmd/multiproduct_kati/main.go +++ b/cmd/multiproduct_kati/main.go @@ -181,8 +181,7 @@ func main() { } build.Build(product.ctx, product.config, buildWhat) if !*keep { - // TODO: kati aborts from opendir while setting up the find emulator - //os.RemoveAll(product.config.OutDir()) + os.RemoveAll(product.config.OutDir()) } log.Println("Finished running for", product.config.TargetProduct()) }() diff --git a/ui/build/kati.go b/ui/build/kati.go index 86db8878..f9907675 100644 --- a/ui/build/kati.go +++ b/ui/build/kati.go @@ -73,20 +73,18 @@ func runKati(ctx Context, config Config) { "--regen", "--ignore_optional_include=" + filepath.Join(config.OutDir(), "%.P"), "--detect_android_echo", + "--color_warnings", + "--gen_all_targets", + "-f", "build/core/main.mk", } if !config.Environment().IsFalse("KATI_EMULATE_FIND") { args = append(args, "--use_find_emulator") } - // The argument order could be simplified, but currently this matches - // the ordering in Make - args = append(args, "-f", "build/core/main.mk") - args = append(args, config.KatiArgs()...) args = append(args, - "--gen_all_targets", "BUILDING_WITH_NINJA=true", "SOONG_ANDROID_MK="+config.SoongAndroidMk(), "SOONG_MAKEVARS_MK="+config.SoongMakeVarsMk()) |