diff options
| author | Lukács T. Berki <lberki@google.com> | 2021-03-11 07:09:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-11 07:09:24 +0000 |
| commit | 2373e597eae05b947315916965e151fde7b57f20 (patch) | |
| tree | b095a2bfd665fe3e17c804a0d2be346521edcc85 /ui | |
| parent | b3d6edd6c0454080b84bdb2c6c0b06e3df04a222 (diff) | |
| parent | b4ced9d8863ae6b55b4a1bba7a9933dc59f157ae (diff) | |
| download | soong-2373e597eae05b947315916965e151fde7b57f20.tar.gz | |
Merge "Fix the environment of soong_build:"
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/soong.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/build/soong.go b/ui/build/soong.go index 5f4a203f7..500abdac5 100644 --- a/ui/build/soong.go +++ b/ui/build/soong.go @@ -116,7 +116,7 @@ func runSoong(ctx Context, config Config) { envFile := filepath.Join(config.SoongOutDir(), "soong.environment.used") getenv := func(k string) string { - v, _ := config.Environment().Get(k) + v, _ := soongBuildEnv.Get(k) return v } if stale, _ := shared.StaleEnvFile(envFile, getenv); stale { @@ -187,7 +187,7 @@ func runSoong(ctx Context, config Config) { // For debugging if os.Getenv("SOONG_DELVE") != "" { - // SOONG_DELVE is already in cmd.Environment + ninjaEnv.Set("SOONG_DELVE", os.Getenv("SOONG_DELVE")) ninjaEnv.Set("SOONG_DELVE_PATH", shared.ResolveDelveBinary()) } |