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

Commit 1985e23e authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

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

Merge "Don't truncate ${USER} when generating ro.build.fingerprint" am: 8543feae am: 8b182afa am: 0eae4581
am: a4cbba82

Change-Id: Ic594289a20543ef4d429a9e5eca511a608afd730
parents b16d9e89 a4cbba82

core/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -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