commit 4c6b66e6172ffcc879ff48f2a245f670471f52e2
author Ying Wang <wangying@android.com> Wed Dec 02 17:55:18 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 02 17:55:18 2015 +0000
tree c0e05f77c565766bbcf85d2523b4726ddc8f3a51
parent 2867533add946cd9d2294ed3b4976f5ecf7aa76e
parent 79215cdeabbc43e47cbfe212eed02e6958ebfb8b

Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER" am: 88ca8aff3e
am: 79215cdeab

* commit '79215cdeabbc43e47cbfe212eed02e6958ebfb8b':
  make USER limited to 6 characters when generating BF_BUILD_NUMBER

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 8c4b43e..1664646 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -122,7 +122,7 @@
   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)
+    BF_BUILD_NUMBER := $(shell echo $${USER:0:6})$(shell $(DATE) +%m%d%H%M)
   else
     BF_BUILD_NUMBER := $(BUILD_NUMBER)
   endif