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

Merge "Updates for the new ckati drop"

Browse Source
This commit is contained in:
Treehugger Robot
2017-02-24 23:20:21 +00:00
committed by Gerrit Code Review
parent 664806a843 c38d366d78
commit 4c46af8943
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/multiproduct_kati/main.go
View File

@@ -181,8 +181,7 @@ func main() {
} }
build.Build(product.ctx, product.config, buildWhat) build.Build(product.ctx, product.config, buildWhat)
if !*keep { 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()) log.Println("Finished running for", product.config.TargetProduct())
}() }()

8
ui/build/kati.go
View File

@@ -73,20 +73,18 @@ func runKati(ctx Context, config Config) {
"--regen", "--regen",
"--ignore_optional_include=" + filepath.Join(config.OutDir(), "%.P"), "--ignore_optional_include=" + filepath.Join(config.OutDir(), "%.P"),
"--detect_android_echo", "--detect_android_echo",
"--color_warnings",
"--gen_all_targets",
"-f", "build/core/main.mk",
} }
if !config.Environment().IsFalse("KATI_EMULATE_FIND") { if !config.Environment().IsFalse("KATI_EMULATE_FIND") {
args = append(args, "--use_find_emulator") 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, config.KatiArgs()...)
args = append(args, args = append(args,
"--gen_all_targets",
"BUILDING_WITH_NINJA=true", "BUILDING_WITH_NINJA=true",
"SOONG_ANDROID_MK="+config.SoongAndroidMk(), "SOONG_ANDROID_MK="+config.SoongAndroidMk(),
"SOONG_MAKEVARS_MK="+config.SoongMakeVarsMk()) "SOONG_MAKEVARS_MK="+config.SoongMakeVarsMk())