Revert "Always run asan ckati on the build servers"
This reverts commit a3e6c520ac835ce22eb130bda8e043d829093052. I fixed
a few heavy stack users, and we've got better debugging.
Bug: 36182021
Test: m dist
Change-Id: Iefd8589185720e44c40a2e0ceff5fd1438211b86
diff --git a/ui/build/config.go b/ui/build/config.go
index 2b0da4d..c8d7292 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -437,21 +437,13 @@
}
}
-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)