tequilaOS/platform_vendor_tequila
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cm versioning: Empty keys == default keys

Browse source 
Don't assume the path to the signing key is the default, it can
be empty and have the same meaning...

Change-Id: Id545d6436e9f21d6b62eec5a317ea7665190f104
This commit is contained in:
Ricardo Cerqueira 2014-01-11 16:00:16 +00:00
parent 89e67b441e
commit 74b4f9b149
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/common.mk
View file

@ -297,6 +297,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
CM_DISPLAY_VERSION := $(CM_VERSION) CM_DISPLAY_VERSION := $(CM_VERSION)
ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),)
ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey) ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
ifneq ($(CM_BUILDTYPE), UNOFFICIAL) ifneq ($(CM_BUILDTYPE), UNOFFICIAL)
ifndef TARGET_VENDOR_RELEASE_BUILD_ID 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) CM_DISPLAY_VERSION=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(TARGET_VENDOR_RELEASE_BUILD_ID)
endif endif
endif endif
endif
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.cm.display.version=$(CM_DISPLAY_VERSION) ro.cm.display.version=$(CM_DISPLAY_VERSION)