openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Define UseBazel in Config 

The UseBazel() function will be used in several places to perform
different functionality such as setting up the metrics path.

Bug: b/173028918
Test: m nothing
Change-Id: Ie94073b8f0552ec7528e1cc2f3be74b693dc3135
This commit is contained in:
Patrice Arruda 2020-11-11 13:01:25 -08:00
parent 9414a8be12
commit 0c1c456643
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/soong_ui/main.go
View File

@ -471,11 +471,9 @@ func make(ctx build.Context, config build.Config, _ []string, logsDir string) {
ctx.Fatal("done") ctx.Fatal("done")
} }
var toBuild int toBuild := build.BuildAll
if _, ok := config.Environment().Get("USE_BAZEL"); ok { if config.UseBazel() {
toBuild = build.BuildAllWithBazel toBuild = build.BuildAllWithBazel
} else {
toBuild = build.BuildAll
} }
if config.Checkbuild() { if config.Checkbuild() {

10
ui/build/config.go
View File

@ -840,6 +840,16 @@ func (c *configImpl) UseRBE() bool {
return false return false
} }
func (c *configImpl) UseBazel() bool {
if v, ok := c.environ.Get("USE_BAZEL"); ok {
v = strings.TrimSpace(v)
if v != "" && v != "false" {
return true
}
}
return false
}
func (c *configImpl) StartRBE() bool { func (c *configImpl) StartRBE() bool {
if !c.UseRBE() { if !c.UseRBE() {
return false return false