diff options
| author | Ying Wang <wangying@google.com> | 2015-10-28 18:45:03 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-10-28 18:47:00 -0700 |
| commit | 21ec03d1867091e7e5d7d14c11400e6d34402a58 (patch) | |
| tree | ed153aa3c0cff89d07184563fe8bd655c7ce3a64 | |
| parent | dda5e96b144c15a75d625ceac7e92b50cf9c363a (diff) | |
| download | build-21ec03d1867091e7e5d7d14c11400e6d34402a58.tar.gz | |
Add _asan suffix to ro.build.flavor for ASAN builds.
Bug: 25344475
Change-Id: I27f2472906631239ca725ee09da2ab791cad2195
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index db568d069d..c26815f78b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -177,6 +177,12 @@ endef BUILDINFO_SH := build/tools/buildinfo.sh +# TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test harness to distinguish builds. +TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) +ifdef SANITIZE_TARGET +TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan +endif + ifdef TARGET_SYSTEM_PROP system_prop_file := $(TARGET_SYSTEM_PROP) else @@ -194,7 +200,7 @@ ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES),) echo "import /oem/oem.prop $(prop)" >> $@;) endif $(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \ - TARGET_BUILD_FLAVOR="$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" \ + TARGET_BUILD_FLAVOR="$(TARGET_BUILD_FLAVOR)" \ TARGET_DEVICE="$(TARGET_DEVICE)" \ PRODUCT_NAME="$(TARGET_PRODUCT)" \ PRODUCT_BRAND="$(PRODUCT_BRAND)" \ |