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 am: dd28ec5116 am: ea62b3d743 am: afe8619e1b 

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

Change-Id: Ia17a5c2aa52856a81e3a630e2d15c859c555ebca
This commit is contained in:
Kousik Kumar 2021-09-09 21:39:06 +00:00 committed by Automerger Merge Worker
parent d55b250500 afe8619e1b
commit b359504b10
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

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