From 062b01150268a75aad27693bbf29416b4da651d5 Mon Sep 17 00:00:00 2001 From: Kousik Kumar Date: Tue, 31 Aug 2021 01:26:19 -0400 Subject: Load env variables before c.config() If the env variables are loaded after the config object is created, they aren't set in the Environment object inside the config object which causes RBE to not work Bug: b/198045383 Test: Tested by running a build against rvc-dev branch and ensuring it works. Change-Id: I509289467df81e5535b4cbbfe4e5eb336c0e4e59 --- cmd/soong_ui/main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index 8453413c7..ffbe7de4f 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -196,13 +196,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) -- cgit v1.2.3