diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-10-12 20:20:41 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2017-10-14 00:43:13 +0000 |
commit | 8122bd58baf298778fe087f2f264091e595de06f (patch) | |
tree | a85fc20207dfe916586c1fbde14847c5de473bf4 /ui | |
parent | 75d2c170b42f98dae912be26fb6884621217065c (diff) | |
download | build_soong-8122bd58baf298778fe087f2f264091e595de06f.tar.gz build_soong-8122bd58baf298778fe087f2f264091e595de06f.tar.bz2 build_soong-8122bd58baf298778fe087f2f264091e595de06f.zip |
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
Diffstat (limited to 'ui')
-rw-r--r-- | ui/build/config.go | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index 2b0da4dc..c8d72921 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -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) |