From 0f71db3248afde733e561dc000b09719f33a9ee7 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Mon, 14 Aug 2017 07:57:37 -0700 Subject: [PATCH] Don't append _asan to non-asan build flavors. Right now we add the '_asan' suffix to the build flavor whenever SANITIZE_TARGET is defined. This patch ensures the suffix is only added when SANITIZE_TARGET=address. Test: Checked flavor of SANITIZE_TARGET=address and integer_overflow builds. Bug: 30969751 Bug: 64561273 Change-Id: Ie20340f81b395e0b6b5f8086350bbc20f83d5fa4 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index fae81a4f6..ec2bf81d7 100644 --- a/core/Makefile +++ b/core/Makefile @@ -196,7 +196,7 @@ BUILDINFO_SH := build/tools/buildinfo.sh # if it isn't already a part of the flavor (via a dedicated lunch # config for example). TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) -ifdef SANITIZE_TARGET +ifneq (, $(filter address, $(SANITIZE_TARGET))) ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR))) TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan endif