Instead of pairing the reading of CleanSpec.mk files with the reading of Android.mk files, split them into separate, individually cachable steps. This way we only read Android.mk files once after a clean/sync. We'll still read the CleanSpec.mk files multiple times, but that's significantly faster than reading all the Android.mk files. This adds about 50ms if kati doesn't need to reread the CleanSpec.mk files. Reading all the CleanSpec.mk files takes about a second. Bug: 35970961 Test: m clean; m nothing; m nothing Test: Add CleanSpec.mk line, see it executed. Change-Id: I83bad15c50709510959d5b8b673a907b8aa7de82
71 lines
1.8 KiB
Go
71 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"
|
|
)
|
|
|
|
type Sandbox string
|
|
|
|
const (
|
|
noSandbox = ""
|
|
globalSandbox = "build/soong/ui/build/sandbox/darwin/global.sb"
|
|
makeSandbox = globalSandbox
|
|
soongSandbox = globalSandbox
|
|
katiSandbox = globalSandbox
|
|
katiCleanSpecSandbox = globalSandbox
|
|
)
|
|
|
|
var sandboxExecPath string
|
|
|
|
func init() {
|
|
if p, err := exec.LookPath("sandbox-exec"); err == nil {
|
|
sandboxExecPath = p
|
|
}
|
|
}
|
|
|
|
func (c *Cmd) sandboxSupported() bool {
|
|
if c.Sandbox == "" {
|
|
return false
|
|
} else if sandboxExecPath == "" {
|
|
c.ctx.Verboseln("sandbox-exec not found, disabling sandboxing")
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
func (c *Cmd) wrapSandbox() {
|
|
homeDir, _ := c.Environment.Get("HOME")
|
|
outDir, err := filepath.Abs(c.config.OutDir())
|
|
if err != nil {
|
|
c.ctx.Fatalln("Failed to get absolute path of OUT_DIR:", err)
|
|
}
|
|
distDir, err := filepath.Abs(c.config.DistDir())
|
|
if err != nil {
|
|
c.ctx.Fatalln("Failed to get absolute path of DIST_DIR:", err)
|
|
}
|
|
|
|
c.Args[0] = c.Path
|
|
c.Path = sandboxExecPath
|
|
c.Args = append([]string{
|
|
"sandbox-exec", "-f", string(c.Sandbox),
|
|
"-D", "HOME=" + homeDir,
|
|
"-D", "OUT_DIR=" + outDir,
|
|
"-D", "DIST_DIR=" + distDir,
|
|
}, c.Args...)
|
|
}
|