config: Remove TARGET_VENDOR_RELEASE_BUILD_ID
Change-Id: I5007d6e4991f911a8fdaaa07a7f263bd28af9c57
This commit is contained in:
@@ -249,15 +249,7 @@ ifeq ($(LINEAGE_BUILDTYPE), UNOFFICIAL)
|
||||
endif
|
||||
|
||||
ifeq ($(LINEAGE_BUILDTYPE), RELEASE)
|
||||
ifndef TARGET_VENDOR_RELEASE_BUILD_ID
|
||||
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(LINEAGE_BUILD)
|
||||
else
|
||||
ifeq ($(TARGET_BUILD_VARIANT),user)
|
||||
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD)
|
||||
else
|
||||
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(LINEAGE_BUILD)
|
||||
endif
|
||||
endif
|
||||
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(LINEAGE_BUILD)
|
||||
else
|
||||
ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true)
|
||||
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d_%H%M%S)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
|
||||
@@ -276,16 +268,12 @@ LINEAGE_DISPLAY_VERSION := $(LINEAGE_VERSION)
|
||||
ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),)
|
||||
ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
|
||||
ifneq ($(LINEAGE_BUILDTYPE), UNOFFICIAL)
|
||||
ifndef TARGET_VENDOR_RELEASE_BUILD_ID
|
||||
ifneq ($(LINEAGE_EXTRAVERSION),)
|
||||
# Remove leading dash from LINEAGE_EXTRAVERSION
|
||||
LINEAGE_EXTRAVERSION := $(shell echo $(LINEAGE_EXTRAVERSION) | sed 's/-//')
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := $(LINEAGE_EXTRAVERSION)
|
||||
else
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d)
|
||||
endif
|
||||
ifneq ($(LINEAGE_EXTRAVERSION),)
|
||||
# Remove leading dash from LINEAGE_EXTRAVERSION
|
||||
LINEAGE_EXTRAVERSION := $(shell echo $(LINEAGE_EXTRAVERSION) | sed 's/-//')
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := $(LINEAGE_EXTRAVERSION)
|
||||
else
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID)
|
||||
TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d)
|
||||
endif
|
||||
LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD)
|
||||
endif
|
||||
|
Reference in New Issue
Block a user