Automated import from //branches/donutburger/...@142410,142410
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.