openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ebddb4af48b5658737403624c5a9ce1483d218c
This commit is contained in:
Lukács T. Berki 2021-03-11 08:25:54 +00:00 committed by Automerger Merge Worker
parent 0a74edc095 6222fd77f5
commit 6a4cb09496
1 changed files with 2 additions and 2 deletions
Show Stats 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")
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())
}