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
This commit is contained in:
@@ -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())
|
||||
}()
|
||||
|
@@ -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())
|
||||
|
Reference in New Issue
Block a user