Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3abcfb2e authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix xz with SANITIZE_HOST" am: b16a5b8d am: ad8b1334 

am: 10cdd60b

Change-Id: I380000837059a9f1f447851f92aa9b51d56e9c4c
parents 474edde7 10cdd60b

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper 
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