p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Use ASAN prebuilts if SANITIZE_HOST includes address" am: daba887656 am: 3a14d45f83 am: b4cfe8c7f9 

am: 9f9d5f001f

Change-Id: I7cdc8abcaccccf89631673b5b5f56bd092c4ab94
This commit is contained in:
Dan Willemsen 2016-10-07 01:38:39 +00:00 committed by android-build-merger
parent c9b3032fe7 9f9d5f001f
commit 08c7cf1765
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.mk
View File

@ -467,7 +467,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

4
core/ninja.mk
View File

@ -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