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

Revert "Load env variables before c.config()" 

This reverts commit 062b011502.

Reason for revert: This change is accidentally opting in a bunch of people into RBE because we aren't respecting USE_RBE variable in rvc-dev branch (possibly missing cherry-pick of some earlier fix).

Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
Change-Id: Ic678b63b165deb3ac4ec3d3c5cbc166621d8eec3
This commit is contained in:
Kousik Kumar 2021-09-01 21:47:02 +00:00
parent 062b011502
commit 4e88859af0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/soong_ui/main.go
View File

@ -196,12 +196,13 @@ func main() {
Status: stat, Status: stat,
}} }}
config := c.config(buildCtx, args...)
if err := loadEnvConfig(); err != nil { if err := loadEnvConfig(); err != nil {
fmt.Fprintf(os.Stderr, "failed to parse env config files: %v", err) fmt.Fprintf(os.Stderr, "failed to parse env config files: %v", err)
os.Exit(1) os.Exit(1)
} }
config := c.config(buildCtx, args...)
build.SetupOutDir(buildCtx, config) build.SetupOutDir(buildCtx, config)