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

Commit 4d386c8e authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 13a476c4: am 2f1f30a9: Merge "Trim down BUILD_FINGERPRINT." 

* commit '13a476c4':
  Trim down BUILD_FINGERPRINT.
parents cbade385 13a476c4

core/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -111,7 +111,14 @@ $(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_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

  ifneq ($(filter eng.%,$(BUILD_NUMBER)),)

    # Trim down BUILD_FINGERPRINT: the default BUILD_NUMBER makes it easily exceed

    # the Android system property length limit (PROPERTY_VALUE_MAX=92).

    BF_BUILD_NUMBER := $(USER)$(shell date +%m%d%H%M)

  else

    BF_BUILD_NUMBER := $(BUILD_NUMBER)

  endif

  BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

endif

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

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

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID := OPENMASTER

BUILD_ID := AOSP



DISPLAY_BUILD_NUMBER := true