cm: include minor version in CM_VERSION if not 0
Change-Id: I0b7d0227bcb0fc5de831bcb065e087afece89a34
diff --git a/config/common.mk b/config/common.mk
index 1c4cce9..7689760 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -210,7 +210,11 @@
ifdef CM_RELEASE
CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
else
- CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+ ifeq ($(PRODUCT_VERSION_MINOR),0)
+ CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+ else
+ CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+ endif
endif
PRODUCT_PROPERTY_OVERRIDES += \