commit 7cc096ed20c6153959c80af2f047dd47c0484a55
author Ying Wang <wangying@android.com> Wed Dec 02 17:58:00 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 02 17:58:00 2015 +0000
tree 80057c0799dc92bd1079d7fec56f7bd9ef4323ed
parent 0ed2001f91cb8ced0dee596243f98089d20b1ccd
parent 4c6b66e6172ffcc879ff48f2a245f670471f52e2

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

* commit '4c6b66e6172ffcc879ff48f2a245f670471f52e2':
  make USER limited to 6 characters when generating BF_BUILD_NUMBER

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index db9bd91..faac750 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