commit 9b7ea689a1533709b3265540b196263319de89fd
author Jorrit Jongma <git@jongma.org> Thu Oct 17 00:00:16 2013 +0200
committer slickrick <rsalinas1@mail.usf.edu> Thu Oct 17 23:51:36 2013 -0700
tree 301b4975f42bf4125e10a7466529d574ec9e5b2a
parent b3e27ae0b3b162c0f87036de8d87b6ccfc51a831

Adjust ro.modversion and add ro.omni.version

Both properties are similar, but ro.modversion is prefixed with
OmniROM-. custom_ and omni_ are removed from the TARGET_PRODUCT
portion of the identifier (other product types will still show)

Change-Id: Ia08d337f7132c22eb71244e886dbe4d5ba24d158
Signed-off-by: Jorrit Jongma <git@jongma.org>

config/version.mk

diff --git a/config/version.mk b/config/version.mk
index 63330a8..7f0ebe1 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -20,13 +20,18 @@
 	ROM_BUILDTYPE := HOMEMADE
 endif
 
+TARGET_PRODUCT_SHORT := $(TARGET_PRODUCT)
+TARGET_PRODUCT_SHORT := $(subst omni_,,$(TARGET_PRODUCT_SHORT))
+
 # Build the final version string
 ifdef BUILDTYPE_RELEASE
-	ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(TARGET_PRODUCT)
+	ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(TARGET_PRODUCT_SHORT)
 else
-	ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT)-$(ROM_BUILDTYPE)
+	ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
 endif
 
 # Apply it to build.prop
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.modversion=$(ROM_VERSION)
+	ro.modversion=OmniROM-$(ROM_VERSION) \
+	ro.omni.version=$(ROM_VERSION)
+