269a8c78e7
Wrap os/exec.Cmd to use our Context and Config interfaces for automatic logging and error handling. It also simplifies environment modification based on the Config's environment. This also adds sandboxing on Macs using sandbox-exec. A simple profile is provided that only logs on violations, though multiproduct_kati on AOSP has no violations. This isn't applied to ninja, only make / soong / kati to start with. I measured <5% time increase in reading all makefiles, and no noticable difference when kati doesn't regenerate. I'd like to spin up a process to dump violation logs into our log file, but the log reporting changed over the range of Mac versions that we support, so that's going to be more complicated. Opening Console.app works in all cases if you're local -- just search/filter for sandbox. Linux sandboxing will be implemented later -- the sandbox definition is opaque enough to support a different implementation. Test: multiproduct_kati on AOSP master on Mac Change-Id: I7046229333d0dcc8f426a493e0f7380828879f17
48 lines
1.4 KiB
Go
48 lines
1.4 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 (
|
|
"path/filepath"
|
|
)
|
|
|
|
func runSoongBootstrap(ctx Context, config Config) {
|
|
ctx.BeginTrace("bootstrap soong")
|
|
defer ctx.EndTrace()
|
|
|
|
cmd := Command(ctx, config, "soong bootstrap", "./bootstrap.bash")
|
|
cmd.Environment.Set("BUILDDIR", config.SoongOutDir())
|
|
cmd.Sandbox = soongSandbox
|
|
cmd.Stdout = ctx.Stdout()
|
|
cmd.Stderr = ctx.Stderr()
|
|
cmd.RunOrFatal()
|
|
}
|
|
|
|
func runSoong(ctx Context, config Config) {
|
|
ctx.BeginTrace("soong")
|
|
defer ctx.EndTrace()
|
|
|
|
cmd := Command(ctx, config, "soong",
|
|
filepath.Join(config.SoongOutDir(), "soong"), "-w", "dupbuild=err")
|
|
if config.IsVerbose() {
|
|
cmd.Args = append(cmd.Args, "-v")
|
|
}
|
|
cmd.Environment.Set("SKIP_NINJA", "true")
|
|
cmd.Sandbox = soongSandbox
|
|
cmd.Stdin = ctx.Stdin()
|
|
cmd.Stdout = ctx.Stdout()
|
|
cmd.Stderr = ctx.Stderr()
|
|
cmd.RunOrFatal()
|
|
}
|