Merge "Don't truncate ${USER} when generating ro.build.fingerprint"

am: 8543feae1d

Change-Id: Id5afb5ee4a11034ab8ae03f1d386c7f7c68c5bb0
This commit is contained in:
Tom Cherry 2017-10-18 23:24:19 +00:00 committed by android-build-merger
commit 8b182afa9b

View file

@ -198,9 +198,7 @@ $(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. # The string used to uniquely identify the combined build and product; used by the OTA server.
ifeq (,$(strip $(BUILD_FINGERPRINT))) ifeq (,$(strip $(BUILD_FINGERPRINT)))
ifneq ($(filter eng.%,$(BUILD_NUMBER)),) ifneq ($(filter eng.%,$(BUILD_NUMBER)),)
# Trim down BUILD_FINGERPRINT: the default BUILD_NUMBER makes it easily exceed BF_BUILD_NUMBER := $(USER)$(shell $(DATE) +%m%d%H%M)
# the Android system property length limit (PROPERTY_VALUE_MAX=92).
BF_BUILD_NUMBER := $(shell echo $${USER:0:6})$(shell $(DATE) +%m%d%H%M)
else else
BF_BUILD_NUMBER := $(BUILD_NUMBER) BF_BUILD_NUMBER := $(BUILD_NUMBER)
endif endif