Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cce30b6d authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

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

am: f0a8dd43

* commit 'f0a8dd43':
  Add _asan suffix to ro.build.flavor for ASAN builds.
parents 603e4ed5 f0a8dd43

core/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -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)" \