commit 3b4d17ffe7a8c9ec193d765ee6bd9c2606257344
author Dan Willemsen <dwillemsen@google.com> Wed Oct 05 23:26:24 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Oct 05 23:26:24 2016 -0700
tree 016c0ad14bb279f34700674bc967cf632df91dd3
parent 480678e220108cfe66f5c687078a4e0a116a9c15

Use ASAN prebuilts if SANITIZE_HOST includes address

Test: SANITIZE_HOST=address m -j showcommands
Change-Id: Ifdca98d5fa32867005ace99e1eb5188e22923ac6

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index bab31b7..d46e5de 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -463,7 +463,11 @@
 
 # Always use prebuilts for ckati and makeparallel
 prebuilt_build_tools := prebuilts/build-tools
+ifeq ($(filter address,$(SANITIZE_HOST)),)
 prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin
+else
+prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/asan/bin
+endif
 ACP := $(prebuilt_build_tools_bin)/acp
 CKATI := $(prebuilt_build_tools_bin)/ckati
 IJAR := $(prebuilt_build_tools_bin)/ijar