Merge "Selectively add _asan flavor suffix." am: e5143608df
am: faea53a89b
am: 8b4eaf5562
Change-Id: I9cf0694a66452109a56c693747e9e864af93b594
This commit is contained in:
@@ -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)
|
||||||
|
Reference in New Issue
Block a user