diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-09 20:44:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 20:44:48 +0000 |
| commit | dd28ec5116a480fa658362d62294d88ecd849b76 (patch) | |
| tree | 6ec29f83fb1b99542cd6e2c291d36388d1464960 | |
| parent | b24137e0cff8566031faeaa250bae2c6000f9d58 (diff) | |
| parent | 9ecad7478f585110f2d0eac33ef0e4a752c8d01d (diff) | |
| download | soong-dd28ec5116a480fa658362d62294d88ecd849b76.tar.gz | |
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: I432a96406905bf64a1bad06ec0c902d372802346
| -rw-r--r-- | cmd/soong_ui/main.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index ffe502a96..c9d80d54b 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -195,13 +195,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) |