1e70446251
Right now this mostly just copies what Make is doing in build/core/ninja.mk and build/core/soong.mk. The only major feature it adds is a rotating log file with some verbose logging. There is one major functional difference -- you cannot override random Make variables during the Make phase anymore. The environment variable is set, and if Make uses ?= or the equivalent, it can still use those variables. We already made this change for Kati, which also loads all of the same code and actually does the build, so it has been half-removed for a while. The only "UI" this implements is what I'll call "Make Emulation" mode -- it's expected that current command lines will continue working, and we'll explore alternate user interfaces later. We're still using Make as a wrapper, but all it does is call into this single Go program, it won't even load the product configuration. Once this is default, we can start moving individual users over to using this directly (still in Make emulation mode), skipping the Make wrapper. Ideas for the future: * Generating trace files showing time spent in Make/Kati/Soong/Ninja (also importing ninja traces into the same stream). I had this working in a previous version of this patch, but removed it to keep the size down and focus on the current features. * More intelligent SIGALRM handling, once we fully remove the Make wrapper (which hides the SIGALRM) * Reading the experimental binary output stream from Ninja, so that we can always save the verbose log even if we're not printing it out to the console Test: USE_SOONG_UI=true m -j blueprint_tools Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
57 lines
1.8 KiB
Go
57 lines
1.8 KiB
Go
// Copyright 2017 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package build
|
|
|
|
import (
|
|
"os/exec"
|
|
"path/filepath"
|
|
)
|
|
|
|
func runSoongBootstrap(ctx Context, config Config) {
|
|
cmd := exec.CommandContext(ctx.Context, "./bootstrap.bash")
|
|
env := config.Environment().Copy()
|
|
env.Set("BUILDDIR", config.SoongOutDir())
|
|
cmd.Env = env.Environ()
|
|
cmd.Stdout = ctx.Stdout()
|
|
cmd.Stderr = ctx.Stderr()
|
|
ctx.Verboseln(cmd.Path, cmd.Args)
|
|
if err := cmd.Run(); err != nil {
|
|
if e, ok := err.(*exec.ExitError); ok {
|
|
ctx.Fatalln("soong bootstrap failed with:", e.ProcessState.String())
|
|
} else {
|
|
ctx.Fatalln("Failed to run soong bootstrap:", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func runSoong(ctx Context, config Config) {
|
|
cmd := exec.CommandContext(ctx.Context, filepath.Join(config.SoongOutDir(), "soong"), "-w", "dupbuild=err")
|
|
if config.IsVerbose() {
|
|
cmd.Args = append(cmd.Args, "-v")
|
|
}
|
|
env := config.Environment().Copy()
|
|
env.Set("SKIP_NINJA", "true")
|
|
cmd.Env = env.Environ()
|
|
cmd.Stdout = ctx.Stdout()
|
|
cmd.Stderr = ctx.Stderr()
|
|
ctx.Verboseln(cmd.Path, cmd.Args)
|
|
if err := cmd.Run(); err != nil {
|
|
if e, ok := err.(*exec.ExitError); ok {
|
|
ctx.Fatalln("soong bootstrap failed with:", e.ProcessState.String())
|
|
} else {
|
|
ctx.Fatalln("Failed to run soong bootstrap:", err)
|
|
}
|
|
}
|
|
}
|