Add _asan suffix to ro.build.flavor for ASAN builds.

Bug: 25344475
Change-Id: I27f2472906631239ca725ee09da2ab791cad2195

diff --git a/core/Makefile b/core/Makefile
index db568d0..c26815f 100644 (file)
--- 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)" \