Merge "Don't truncate ${USER} when generating ro.build.fingerprint" am: 8543feae1d am: 8b182afa9b

am: 0eae458144

Change-Id: Ib50760a9ac60e4f72faee4551f36b123446a1dbf
This commit is contained in:
Tom Cherry 2017-10-18 23:28:24 +00:00 committed by android-build-merger
commit a4cbba82f7

View file

@ -201,9 +201,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.
ifeq (,$(strip $(BUILD_FINGERPRINT)))
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 := $(shell echo $${USER:0:6})$(shell $(DATE) +%m%d%H%M)
BF_BUILD_NUMBER := $(USER)$(shell $(DATE) +%m%d%H%M)
else
BF_BUILD_NUMBER := $(BUILD_NUMBER)
endif