diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-02 00:33:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 00:33:21 +0000 |
| commit | e41ee225ae4af5added3723fdb950748f9576ec1 (patch) | |
| tree | b1f26eed01ac189406b9de56804efc94889ed014 | |
| parent | de85899f784f8146ea8c7f8b237f92cb0134ddca (diff) | |
| parent | 51c318f4039e1e1a9a48364ce6387293ceb699ac (diff) | |
Revert "Load env variables before c.config()" am: 4e88859af0 am: 51c318f403
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350
Change-Id: Ia229ea5263a3456015ad2d446ce9f77f5e7639d0
| -rw-r--r-- | cmd/soong_ui/main.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index 02c522977..8bcc71202 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -205,12 +205,13 @@ 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) |