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

Unverified Commit bca6155f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Michael Bestas
Browse files

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

Companion change to Ic5913e587400dd38c04aa05de3a7becced77a59e

Change-Id: If5edbf56d567701f96f0ba46af9a90ffa8310c24
parent 1e817682

core/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -137,8 +137,12 @@ 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_FROM_FILE)

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_FROM_FILE) $(BUILD_VERSION_TAGS)

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

$(intermediate_system_build_prop): PRIVATE_BUILD_DESC := $(build_desc)



# The string used to uniquely identify the combined build and product; used by the OTA server.
@@ -150,6 +154,9 @@ ifeq (,$(strip $(BUILD_FINGERPRINT))) 
  else

    BF_BUILD_NUMBER := $(BUILD_NUMBER)

  endif

  ifneq ($(TARGET_VENDOR_RELEASE_BUILD_ID),)

    BF_BUILD_NUMBER := $(TARGET_VENDOR_RELEASE_BUILD_ID)

  endif

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

endif

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