version: Remove dash from TARGET_VENDOR_RELEASE_BUILD_ID
This variable is used to build the fingerprint and description on signed builds, and the dash can't go in there. Add it only when constructing the final display version variable Change-Id: I0736d3a88e5f9980c28e6e9afa7e2f9e2d23f815
This commit is contained in:
parent
1acbadb7ff
commit
17b25874d1
|
@ -305,14 +305,16 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
|
|||
ifneq ($(CM_BUILDTYPE), UNOFFICIAL)
|
||||
ifndef TARGET_VENDOR_RELEASE_BUILD_ID
|
||||
ifneq ($(CM_EXTRAVERSION),)
|
||||
# Remove leading dash from CM_EXTRAVERSION
|
||||
CM_EXTRAVERSION := $(shell echo $(CM_EXTRAVERSION) | sed 's/-//')
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := $(CM_EXTRAVERSION)
|
||||
else
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := -$(shell date -u +%Y%m%d)
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d)
|
||||
endif
|
||||
else
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := -$(TARGET_VENDOR_RELEASE_BUILD_ID)
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID)
|
||||
endif
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue