commit bc1f988afaea186c5ad508fff550189d98698bbb
author Steve Kondik <shade@chemlab.org> Sat Feb 18 23:55:31 2012 +0300
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> Sat Feb 18 23:55:31 2012 +0300
tree 8412aaf289493e046608f8cfc5cc40193de2264b
parent 2dc7045f2b7bdc15b8affc95f1138e24455109b3
parent 06b4c76dea0d8f2da888c20879c1ee70b965e5b4

Merge "Add CM_SNAPSHOT ro.cm.version label option for SNAPSHOT builds." into ics

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 1d91d6c..5303372 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -103,11 +103,16 @@
     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