diff options
| author | Lukacs T. Berki <lberki@google.com> | 2021-03-10 15:43:06 +0100 |
|---|---|---|
| committer | Lukacs T. Berki <lberki@google.com> | 2021-03-10 15:43:06 +0100 |
| commit | b4ced9d8863ae6b55b4a1bba7a9933dc59f157ae (patch) | |
| tree | 7e1b41f33dbe23b1da179a58529837f33bd70c14 /ui | |
| parent | 282671d696c926735d5ff54c3b6e75c2b5559169 (diff) | |
| download | soong-b4ced9d8863ae6b55b4a1bba7a9933dc59f157ae.tar.gz | |
Fix the environment of soong_build:
- Incorporate BAZEL_* variables in soong.environment.available
- Set SOONG_DELVE when requested
Test: Manual.
Change-Id: I3ac675f4876220b788cc48d288b402ac6016c37b
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()) } |