diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-09 21:20:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 21:20:39 +0000 |
| commit | afe8619e1ba8d5525890cec89e7efc42d9467c9e (patch) | |
| tree | e85ce78d80f1dcf2eaf658beb5f7a04e6fd4baae | |
| parent | 1784e3d638a5f5a50566b3454226130cc33b485a (diff) | |
| parent | ea62b3d7439172874d167a7bb70812e20090579f (diff) | |
| download | soong-afe8619e1ba8d5525890cec89e7efc42d9467c9e.tar.gz | |
Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f am: dd28ec5116 am: ea62b3d743
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291
Change-Id: I82ea559e164493d246102f97aa1e432f5d124fe8
| -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 8bcc71202..02c522977 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -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) |