Incorporate TARGET_VENDOR_RELEASE_BUILD_ID into the build identifier if it exists
Change-Id: I24d422abd3817c55cffe17166fb30d7efe48e0a0
This commit is contained in:
parent
41fd0aab57
commit
ae71f04d55
@ -291,7 +291,15 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CM_BUILDTYPE), RELEASE)
|
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
|
else
|
||||||
ifeq ($(PRODUCT_VERSION_MINOR),0)
|
ifeq ($(PRODUCT_VERSION_MINOR),0)
|
||||||
CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)
|
CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)
|
||||||
|
Loading…
Reference in New Issue
Block a user