commit b16a5b8d170ee6cc57ef397c6bfa96b5a3ac8d55
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 10 09:03:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 10 09:03:39 2018 +0000
tree 3e91d6c959fecac5049c24c317788cc12643c9e4
parent 8e287901c3a89cae3369816e10c427f7500ec347
parent 6b3a8380ccdf5c24e1148064ec1404a5fd97ac00

Merge "Fix xz with SANITIZE_HOST"

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