@ -233,7 +233,7 @@ DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common
PRODUCT_VERSION_MAJOR = 13
PRODUCT_VERSION_MINOR = 0
PRODUCT_VERSION_MAINTENANCE = 0-RC0
PRODUCT_VERSION_MAINTENANCE = 1
# Set CM_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat
@ -288,13 +288,21 @@ 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)
CM_VERSION := $( PRODUCT_VERSION_MAJOR) .$( PRODUCT_VERSION_MINOR) -$( TARGET_VENDOR_RELEASE_BUILD_ID) -$( CM_BUILD)
ifeq ( $( PRODUCT_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)
endif
else
CM_VERSION := $( PRODUCT_VERSION_MAJOR) .$( PRODUCT_VERSION_MINOR) .$( PRODUCT_VERSION_MAINTENANCE) $( PRODUCT_VERSION_DEVICE_SPECIFIC) -$( CM_BUILD)
endif
endif
e l s e
CM_VERSION := $( PRODUCT_VERSION_MAJOR) .$( PRODUCT_VERSION_MINOR) -$( shell date -u +%Y%m%d) -$( CM_BUILDTYPE) $( CM_EXTRAVERSION) -$( CM_BUILD)
ifeq ( $( PRODUCT_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)
endif
e n d i f
PRODUCT_PROPERTY_OVERRIDES += \
@ -321,8 +329,12 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
else
TARGET_VENDOR_RELEASE_BUILD_ID := $( TARGET_VENDOR_RELEASE_BUILD_ID)
endif
CM_DISPLAY_VERSION = $( PRODUCT_VERSION_MAJOR) .$( PRODUCT_VERSION_MINOR) -$( TARGET_VENDOR_RELEASE_BUILD_ID)
endif
ifeq ( $( PRODUCT_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)
endif
e n d i f
e n d i f
e n d i f