diff options
Diffstat (limited to 'config/common.mk')
| -rw-r--r-- | config/common.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/config/common.mk b/config/common.mk index a0e49ca..ea5dcaa 100644 --- a/config/common.mk +++ b/config/common.mk @@ -244,11 +244,12 @@ DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common PRODUCT_VERSION_MAJOR = 13 PRODUCT_VERSION_MINOR = 0 +PRODUCT_VERSION_MAINTENANCE := 1 + ifeq ($(TARGET_VENDOR_SHOW_MAINTENANCE_VERSION),true) - PRODUCT_VERSION_MAINTENANCE := 1 + CM_VERSION_MAINTENANCE := $(PRODUCT_VERSION_MAINTENANCE) else - # 0 is ignored - PRODUCT_VERSION_MAINTENANCE := 0 + CM_VERSION_MAINTENANCE := 0 endif # Set CM_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat @@ -304,20 +305,20 @@ ifeq ($(CM_BUILDTYPE), RELEASE) CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) else ifeq ($(TARGET_BUILD_VARIANT),user) - ifeq ($(PRODUCT_VERSION_MAINTENANCE),0) + ifeq ($(CM_VERSION_MAINTENANCE),0) 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)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) + CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) endif else CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) endif endif else - ifeq ($(PRODUCT_VERSION_MAINTENANCE),0) + ifeq ($(CM_VERSION_MAINTENANCE),0) CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD) else - CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD) + CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD) endif endif @@ -345,10 +346,10 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey) else TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID) endif - ifeq ($(PRODUCT_VERSION_MAINTENANCE),0) + ifeq ($(CM_VERSION_MAINTENANCE),0) CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) else - CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) + CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) endif endif endif |