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

Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f 

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

Change-Id: I16a1ac3a5fac8be17ff4ef923422797cd4dff026
This commit is contained in:
Kousik Kumar 2021-09-09 20:44:48 +00:00 committed by Automerger Merge Worker
parent 274c905be6 9ecad7478f
commit ecd9666a57
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/soong_ui/main.go
View File

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