From 74b4f9b149d4afa0a63f3cc0f4a1166b24a71cb1 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Sat, 11 Jan 2014 16:00:16 +0000 Subject: [PATCH] cm versioning: Empty keys == default keys Don't assume the path to the signing key is the default, it can be empty and have the same meaning... Change-Id: Id545d6436e9f21d6b62eec5a317ea7665190f104 --- config/common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/common.mk b/config/common.mk index 91dcd7d6..3dc5cac2 100644 --- a/config/common.mk +++ b/config/common.mk @@ -297,6 +297,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ CM_DISPLAY_VERSION := $(CM_VERSION) +ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),) ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey) ifneq ($(CM_BUILDTYPE), UNOFFICIAL) ifndef TARGET_VENDOR_RELEASE_BUILD_ID @@ -311,6 +312,7 @@ ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey) CM_DISPLAY_VERSION=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(TARGET_VENDOR_RELEASE_BUILD_ID) endif endif +endif PRODUCT_PROPERTY_OVERRIDES += \ ro.cm.display.version=$(CM_DISPLAY_VERSION)