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

This commit is contained in:
Steve Kondik 2012-02-18 23:55:31 +03:00 committed by Gerrit Code Review
commit bc1f988afa

View File

@ -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