StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Selectively add _asan flavor suffix." am: e5143608df am: faea53a89b

Browse Source 
am: 8b4eaf5562

Change-Id: I9cf0694a66452109a56c693747e9e864af93b594
This commit is contained in:
Vishwath Mohan
2017-05-10 00:25:06 +00:00
committed by android-build-merger
parent 1d4ee77843 8b4eaf5562
commit c20272d7ac
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/Makefile
View File

@@ -225,11 +225,16 @@ endef
BUILDINFO_SH := build/tools/buildinfo.sh BUILDINFO_SH := build/tools/buildinfo.sh
VENDOR_BUILDINFO_SH := build/tools/vendor_buildinfo.sh VENDOR_BUILDINFO_SH := build/tools/vendor_buildinfo.sh
# TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test harness to distinguish builds. # TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test
# harness to distinguish builds. Only add _asan for a sanitized build
# 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) TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)
ifdef SANITIZE_TARGET ifdef SANITIZE_TARGET
ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR)))
TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan
endif endif
endif
ifdef TARGET_SYSTEM_PROP ifdef TARGET_SYSTEM_PROP
system_prop_file := $(TARGET_SYSTEM_PROP) system_prop_file := $(TARGET_SYSTEM_PROP)