commit 6b3a8380ccdf5c24e1148064ec1404a5fd97ac00
author Dan Willemsen <dwillemsen@google.com> Fri Mar 09 21:26:17 2018 -0800
committer Dan Willemsen <dwillemsen@google.com> Fri Mar 09 22:38:37 2018 -0800
tree 3e91d6c959fecac5049c24c317788cc12643c9e4
parent 8e287901c3a89cae3369816e10c427f7500ec347

Fix xz with SANITIZE_HOST

There isn't an Address Sanitizer prebuilt of xz, so always use the same
xz prebuilt.

Bug: 36130900
Test: SANITIZE_HOST=address m nothing; check ninja file
Test: m libc
Change-Id: Iba3599d4289ad5afb573dbec5ac8fc463668b1c6

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index cb5ddc8..ec3c847 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -601,7 +601,7 @@
 SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip
 MERGE_ZIPS := $(SOONG_HOST_OUT_EXECUTABLES)/merge_zips
 XMLLINT := $(SOONG_HOST_OUT_EXECUTABLES)/xmllint
-XZ := $(prebuilt_build_tools_bin)/xz
+XZ := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin/xz
 ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip
 ZIPTIME := $(prebuilt_build_tools_bin)/ziptime