diff options
| -rw-r--r-- | core/config.mk | 4 | ||||
| -rw-r--r-- | core/ninja.mk | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index cf1e8e5ade..17fb82cbab 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 diff --git a/core/ninja.mk b/core/ninja.mk index 3779df34a3..50bb56d4ab 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -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 |