| commit | ecd9666a572b98c2136b02438116b1549459d186 | [log] [tgz] |
|---|---|---|
| author | Kousik Kumar <kousikk@google.com> | Thu Sep 09 20:44:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 20:44:48 2021 +0000 |
| tree | 698b052f1d311b0f877350c0ac88e97e1f5bd411 | |
| parent | 274c905be61b47f86f6e64993942263f74ba0adb [diff] | |
| parent | 9ecad7478f585110f2d0eac33ef0e4a752c8d01d [diff] |
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: I16a1ac3a5fac8be17ff4ef923422797cd4dff026
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index ffe502a..c9d80d5 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go
@@ -195,13 +195,12 @@ 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)