commit 24dd78a2d706a383d4b4cead2343875b90dd09eb
author Guang Zhu <guangzhu@google.com> Fri Oct 07 01:15:16 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 07 01:15:17 2016 +0000
tree 384451ef9a8466b364dbc801174e18142ff05542
parent daba8876567a7cc9fe21fa5f10b13b9bc6cb85bf
parent 29fe14721efa2d349ed0da9961f2bf0ec18fa25d

Merge "remove use of CTS_TESTCASES_OUT"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index cf1e8e5..17fb82c 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -466,7 +466,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

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index 8565fbe..30146d2 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -1,4 +1,8 @@
+ifeq ($(filter address,$(SANITIZE_HOST)),)
 NINJA ?= prebuilts/build-tools/$(HOST_PREBUILT_TAG)/bin/ninja
+else
+NINJA ?= prebuilts/build-tools/$(HOST_PREBUILT_TAG)/asan/bin/ninja
+endif
 
 include $(BUILD_SYSTEM)/soong.mk