Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b64124f authored by Sriram Raman's avatar Sriram Raman Committed by The Android Open Source Project
Browse files

Automated import from //branches/donutburger/...@142410,142410

parent d14f6d92

core/Makefile

+16 −0
Original line number Diff line number Diff line
@@ -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.

core/version_defaults.mk

+0 −10
Original line number Diff line number Diff line
@@ -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