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

Make GOROOT consistent

Browse Source 
am: e7945d76ac

Change-Id: I823de19497ce5fdcde74b330ada8ab37ef1c2783
This commit is contained in:
Dan Willemsen
2018-01-24 17:42:47 +00:00
committed by android-build-merger
parent 04e36e89df e7945d76ac
commit d4b4154ee3
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ui/build/soong.go
View File

@@ -35,7 +35,7 @@ func runSoong(ctx Context, config Config) {
cmd.Environment.Set("BLUEPRINTDIR", "./build/blueprint") cmd.Environment.Set("BLUEPRINTDIR", "./build/blueprint")
cmd.Environment.Set("BOOTSTRAP", "./build/blueprint/bootstrap.bash") cmd.Environment.Set("BOOTSTRAP", "./build/blueprint/bootstrap.bash")
cmd.Environment.Set("BUILDDIR", config.SoongOutDir()) cmd.Environment.Set("BUILDDIR", config.SoongOutDir())
cmd.Environment.Set("GOROOT", filepath.Join("./prebuilts/go", config.HostPrebuiltTag())) cmd.Environment.Set("GOROOT", "./"+filepath.Join("prebuilts/go", config.HostPrebuiltTag()))
cmd.Environment.Set("BLUEPRINT_LIST_FILE", filepath.Join(config.FileListDir(), "Android.bp.list")) cmd.Environment.Set("BLUEPRINT_LIST_FILE", filepath.Join(config.FileListDir(), "Android.bp.list"))
cmd.Environment.Set("NINJA_BUILDDIR", config.OutDir()) cmd.Environment.Set("NINJA_BUILDDIR", config.OutDir())
cmd.Environment.Set("SRCDIR", ".") cmd.Environment.Set("SRCDIR", ".")
@@ -99,7 +99,6 @@ func runSoong(ctx Context, config Config) {
if config.IsVerbose() { if config.IsVerbose() {
cmd.Args = append(cmd.Args, "-v") cmd.Args = append(cmd.Args, "-v")
} }
cmd.Environment.Set("GOROOT", filepath.Join("./prebuilts/go", config.HostPrebuiltTag()))
cmd.Sandbox = soongSandbox cmd.Sandbox = soongSandbox
cmd.Stdin = ctx.Stdin() cmd.Stdin = ctx.Stdin()
cmd.Stdout = ctx.Stdout() cmd.Stdout = ctx.Stdout()