| commit | f04dc7f1b1f4f40cacd362a2461c643122b05f48 | [log] [tgz] |
|---|---|---|
| author | Kousik Kumar <kousikk@google.com> | Tue Aug 31 17:33:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 31 17:33:30 2021 +0000 |
| tree | 6b63c1343a003af106a2033b9b7a9c8f78e96c39 | |
| parent | 46d4a140891fb851a8f8947fd5b632259c10c8c8 [diff] | |
| parent | 062b01150268a75aad27693bbf29416b4da651d5 [diff] |
Load env variables before c.config() am: 062b011502 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183 Change-Id: I13773a3be06c8ad4426960b0f2fbc45bbed3e85f
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)