Automated import from //branches/master/...@142411,142411
diff --git a/core/Makefile b/core/Makefile
index 9ba117a..3f452b3 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -79,6 +79,22 @@
$(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")
endif
+# Display parameters shown under Settings -> About Phone
+ifeq ($(TARGET_BUILD_VARIANT),user)
+ # User builds should show:
+ # release build number or branch.buld_number non-release builds
+
+ # Dev. branches should have DISPLAY_BUILD_NUMBER set
+ ifeq "true" "$(DISPLAY_BUILD_NUMBER)"
+ BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER)
+ else
+ BUILD_DISPLAY_ID := $(BUILD_ID)
+ endif
+else
+ # Non-user builds should show detailed build information
+ BUILD_DISPLAY_ID := $(build_desc)
+endif
+
# Selects the first locale in the list given as the argument,
# and splits it into language and region, which each may be
# empty.
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e38a803..578d779 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -72,13 +72,3 @@
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
-
-
