From ae71f04d5530cedbb99f8f6bca074a8ae0d3a06c Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Mon, 11 Nov 2013 00:55:51 +0000 Subject: [PATCH] Incorporate TARGET_VENDOR_RELEASE_BUILD_ID into the build identifier if it exists Change-Id: I24d422abd3817c55cffe17166fb30d7efe48e0a0 --- config/common.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config/common.mk b/config/common.mk index 9d49075b..15902fd1 100644 --- a/config/common.mk +++ b/config/common.mk @@ -291,7 +291,15 @@ else endif ifeq ($(CM_BUILDTYPE), RELEASE) - CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) + ifndef TARGET_VENDOR_RELEASE_BUILD_ID + CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) + else + ifeq ($(TARGET_BUILD_VARIANT),user) + CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) + else + CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) + endif + endif else ifeq ($(PRODUCT_VERSION_MINOR),0) CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)