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

Commit b4cfe8c7 authored Oct 07, 2016 by Dan Willemsen Committed by android-build-merger Oct 07, 2016

Merge "Use ASAN prebuilts if SANITIZE_HOST includes address" am: daba8876

am: 3a14d45f

Change-Id: I2ca851e21aac95df1a214c358b20efb7845d3a35

parents 34d8c312 3a14d45f

core/config.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -466,7 +466,11 @@ ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip

		# 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

+4 −0

Original line number	Diff line number	Diff line
		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