From 06b4c76dea0d8f2da888c20879c1ee70b965e5b4 Mon Sep 17 00:00:00 2001 From: Mike Kasick Date: Sat, 18 Feb 2012 14:34:37 -0500 Subject: [PATCH] Add CM_SNAPSHOT ro.cm.version label option for SNAPSHOT builds. Scheme for labeling date-encoded builds that aren't technically NIGHTLIES. Also includes CM_EXTRAVERSION appendage to add additional designations to SNAPSHOT builds. --- config/common.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/config/common.mk b/config/common.mk index 1d91d6cf..53033727 100644 --- a/config/common.mk +++ b/config/common.mk @@ -103,11 +103,16 @@ ifdef CM_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.cm.version=$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME) else - ifdef CM_RELEASE + ifdef CM_SNAPSHOT PRODUCT_PROPERTY_OVERRIDES += \ - ro.cm.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME) + ro.cm.version=$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-SNAPSHOT-$(PRODUCT_RELEASE_NAME)$(CM_EXTRAVERSION) else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.cm.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG + ifdef CM_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.cm.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME) + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.cm.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG + endif endif endif