commit 88ca8aff3e4c6f776444ca8267b044b314f6aa0f
author Ying Wang <wangying@android.com> Wed Dec 02 17:48:21 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 02 17:48:21 2015 +0000
tree 4cae08a44c6e817757104ed7cff2ed3c4f26ff5f
parent b98fa19703ed0c7608f926007b1df257127ea777
parent 6fa82b50f49d092ae0c3db360ce89d6810469578

Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index ad577a9..67ad228 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