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

Revert "Always run asan ckati on the build servers"

Browse Source 
This reverts commit a3e6c520ac. I fixed
a few heavy stack users, and we've got better debugging.

Bug: 36182021
Test: m dist
Change-Id: Iefd8589185720e44c40a2e0ceff5fd1438211b86
This commit is contained in:
Dan Willemsen
2017-10-12 20:20:41 -07:00
parent 75d2c170b4
commit 8122bd58ba
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ui/build/config.go
View File

@@ -437,22 +437,14 @@ func (c *configImpl) HostPrebuiltTag() string {
} }
} }
func (c *configImpl) HostAsan() bool { func (c *configImpl) PrebuiltBuildTool(name string) string {
if v, ok := c.environ.Get("SANITIZE_HOST"); ok { if v, ok := c.environ.Get("SANITIZE_HOST"); ok {
if sanitize := strings.Fields(v); inList("address", sanitize) { if sanitize := strings.Fields(v); inList("address", sanitize) {
return true
}
}
return false
}
func (c *configImpl) PrebuiltBuildTool(name string) string {
// (b/36182021) We're seeing rare ckati crashes, so always enable asan kati on the build servers.
if c.HostAsan() || (c.Dist() && name == "ckati") {
asan := filepath.Join("prebuilts/build-tools", c.HostPrebuiltTag(), "asan/bin", name) asan := filepath.Join("prebuilts/build-tools", c.HostPrebuiltTag(), "asan/bin", name)
if _, err := os.Stat(asan); err == nil { if _, err := os.Stat(asan); err == nil {
return asan return asan
} }
} }
}
return filepath.Join("prebuilts/build-tools", c.HostPrebuiltTag(), "bin", name) return filepath.Join("prebuilts/build-tools", c.HostPrebuiltTag(), "bin", name)
} }