p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automated import from //branches/cupcake/...@142409,142409

This commit is contained in:
Sriram Raman 2009-03-24 19:39:09 -07:00 committed by The Android Open Source Project
parent 0c56ccb7cc
commit 09591102d0
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/Makefile
View File

@ -79,6 +79,22 @@ ifneq ($(words $(BUILD_FINGERPRINT)),1)
$(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.

10
core/version_defaults.mk
View File

@ -72,13 +72,3 @@ ifeq "" "$(BUILD_NUMBER)"
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