commit 475fa12adef8fc2b08290555a33dc8a9fef05be4
author The Android Open Source Project <initial-contribution@android.com> Tue Feb 10 15:43:57 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Tue Feb 10 15:43:57 2009 -0800
tree 58df3e2bd95b7be3e2bddfa8bf2c95ea8a4fa613
parent 35cfb08c588ba0af98ad0845ced6a9eeeeca4054

auto import from //branches/cupcake/...@130745

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 7a3c682..e38a803 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -71,3 +71,14 @@
   # anyone trying to parse it as an integer will probably get "0".
   BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
 endif
+
+ifeq "true" "$(DISPLAY_BUILD_NUMBER)"
+  # if the build_id.mk has this defined, then BUILD_ID is updated with
+  # the BUILD_NUMBER as well.  For development branches, this will be 
+  # set, but release branches this will not be set.
+  BUILD_DISPLAY_ID := "$(BUILD_ID).$(BUILD_NUMBER)"
+else
+  BUILD_DISPLAY_ID := "$(BUILD_ID)"
+endif
+
+