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

* commit '13a476c40c0354220829efe29224845da78b6326':
  Trim down BUILD_FINGERPRINT.
This commit is contained in:
Ying Wang 2014-06-16 16:33:45 +00:00 committed by Android Git Automerger
commit 4d386c8e04
2 changed files with 9 additions and 2 deletions

View file

@ -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. # The string used to uniquely identify this build; used by the OTA server.
ifeq (,$(strip $(BUILD_FINGERPRINT))) 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 endif
ifneq ($(words $(BUILD_FINGERPRINT)),1) ifneq ($(words $(BUILD_FINGERPRINT)),1)
$(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)") $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")

View file

@ -18,6 +18,6 @@
# (like "CRB01"). It must be a single word, and is # (like "CRB01"). It must be a single word, and is
# capitalized by convention. # capitalized by convention.
BUILD_ID := OPENMASTER BUILD_ID := AOSP
DISPLAY_BUILD_NUMBER := true DISPLAY_BUILD_NUMBER := true