tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Always run asan ckati on the build servers"

Browse source 
am: 8122bd58ba

Change-Id: I4cfd5354e3153f23c757095a046f4e57e6ab5aeb
This commit is contained in:
Dan Willemsen 2017-10-16 01:03:41 +00:00 committed by android-build-merger
commit 63f872a239
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ui/build/config.go
View file

@ -437,21 +437,13 @@ 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 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)
if _, err := os.Stat(asan); err == nil {
return asan
asan := filepath.Join("prebuilts/build-tools", c.HostPrebuiltTag(), "asan/bin", name)
if _, err := os.Stat(asan); err == nil {
return asan
}
}
}
return filepath.Join("prebuilts/build-tools", c.HostPrebuiltTag(), "bin", name)