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()" am: 4e88859af0 am: 51c318f403 am: e41ee225ae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: I1566f5e15e1a28da20c4c7c37bd097c954528ffb
This commit is contained in:
Kousik Kumar 2021-09-02 00:45:41 +00:00 committed by Automerger Merge Worker
parent a9396f3727 e41ee225ae
commit 8c1a61a30f
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

@ -205,12 +205,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)