tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Define UseBazel in Config am: 0c1c456643

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496658

Change-Id: I713abab31350b3f81a5787bc875fd7943f8e1510
This commit is contained in:
Patrice Arruda 2020-11-14 01:42:54 +00:00 committed by Automerger Merge Worker
commit 5439d1cf68
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")
}
var toBuild int
if _, ok := config.Environment().Get("USE_BAZEL"); ok {
toBuild := build.BuildAll
if config.UseBazel() {
toBuild = build.BuildAllWithBazel
} else {
toBuild = build.BuildAll
}
if config.Checkbuild() {

10
ui/build/config.go
View file

@ -840,6 +840,16 @@ func (c *configImpl) UseRBE() bool {
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 {
if !c.UseRBE() {
return false