Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c23d97de authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

For user builds, use a release build id in the description if one exists 

Companion change to Ic5913e587400dd38c04aa05de3a7becced77a59e

Change-Id: If5edbf56d567701f96f0ba46af9a90ffa8310c24
parent 3929a21d

core/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -123,13 +123,17 @@ ifeq ($(TARGET_VENDOR_DEVICE_NAME),) 
TARGET_VENDOR_DEVICE_NAME := $(TARGET_DEVICE)

endif



ifeq ($(TARGET_VENDOR_RELEASE_BUILD_ID),)

TARGET_VENDOR_RELEASE_BUILD_ID := $(BUILD_NUMBER)

endif



# A human-readable string that descibes this build in detail.

build_desc := $(TARGET_VENDOR_PRODUCT_NAME)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER) $(BUILD_VERSION_TAGS)

build_desc := $(TARGET_VENDOR_PRODUCT_NAME)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(TARGET_VENDOR_RELEASE_BUILD_ID) $(BUILD_VERSION_TAGS)

$(INSTALLED_BUILD_PROP_TARGET): PRIVATE_BUILD_DESC := $(build_desc)



# The string used to uniquely identify this build;  used by the OTA server.

ifeq (,$(strip $(BUILD_FINGERPRINT)))

  BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_VENDOR_PRODUCT_NAME)/$(TARGET_VENDOR_DEVICE_NAME):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

  BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_VENDOR_PRODUCT_NAME)/$(TARGET_VENDOR_DEVICE_NAME):$(PLATFORM_VERSION)/$(BUILD_ID)/$(TARGET_VENDOR_RELEASE_BUILD_ID):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

endif

ifneq ($(words $(BUILD_FINGERPRINT)),1)

  $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")