StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the environment of soong_build:" am: 2373e597ea

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89423cbfbd352d3fd88949bd84f27ec98798bd95
This commit is contained in:
Lukács T. Berki
2021-03-11 07:50:54 +00:00
committed by Automerger Merge Worker
parent d32045e2f3 2373e597ea
commit 6222fd77f5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/build/soong.go
View File

@@ -116,7 +116,7 @@ func runSoong(ctx Context, config Config) {
envFile := filepath.Join(config.SoongOutDir(), "soong.environment.used") envFile := filepath.Join(config.SoongOutDir(), "soong.environment.used")
getenv := func(k string) string { getenv := func(k string) string {
v, _ := config.Environment().Get(k) v, _ := soongBuildEnv.Get(k)
return v return v
} }
if stale, _ := shared.StaleEnvFile(envFile, getenv); stale { if stale, _ := shared.StaleEnvFile(envFile, getenv); stale {
@@ -187,7 +187,7 @@ func runSoong(ctx Context, config Config) {
// For debugging // For debugging
if os.Getenv("SOONG_DELVE") != "" { 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()) ninjaEnv.Set("SOONG_DELVE_PATH", shared.ResolveDelveBinary())
} }