diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-07-24 15:58:20 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-07-24 15:58:20 -0700 |
| commit | 05f17764c39531bcbf2992ff12cb1cf36a609eab (patch) | |
| tree | 7c35102eab663537d96aedb26925feee571468f0 /ui | |
| parent | 91f9b547672ecb20a308d52df3a0c09d616cb1b9 (diff) | |
| download | build_soong-05f17764c39531bcbf2992ff12cb1cf36a609eab.tar.gz build_soong-05f17764c39531bcbf2992ff12cb1cf36a609eab.tar.bz2 build_soong-05f17764c39531bcbf2992ff12cb1cf36a609eab.zip | |
Use a unified ninja builddir
Instead of calling SetNinjaBuildDir, pass it to bootstrap.bash, so that
the bootstrap package can set it consistently during bootstrapping and
normal execution.
Bug: 63720725
Test: m -j nothing
Test: mkdir o; ../bootstrap.bash; ./soong
Change-Id: Ica88d2d5f1461b5be49bfe6316c6ec4ef4d89d49
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/soong.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/build/soong.go b/ui/build/soong.go index ddfe666c..d242805e 100644 --- a/ui/build/soong.go +++ b/ui/build/soong.go @@ -24,6 +24,7 @@ func runSoongBootstrap(ctx Context, config Config) { cmd := Command(ctx, config, "soong bootstrap", "./bootstrap.bash") cmd.Environment.Set("BUILDDIR", config.SoongOutDir()) + cmd.Environment.Set("NINJA_BUILDDIR", config.OutDir()) cmd.Sandbox = soongSandbox cmd.Stdout = ctx.Stdout() cmd.Stderr = ctx.Stderr() |