diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-09 21:39:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 21:39:06 +0000 |
| commit | b359504b102e5d02ddfe03486a6076f2bfe3428f (patch) | |
| tree | f7ef64718e3613d882a2f2b07dd569b34ed48cdb | |
| parent | d55b250500cdd8330213d7ae31b38395f181cfdf (diff) | |
| parent | afe8619e1ba8d5525890cec89e7efc42d9467c9e (diff) | |
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
| -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) |