commit df1fff12fe1a844b7ed86b95d478fccb266b1ae6
author Lance Chang <jinwoong@google.com> Sat May 28 18:43:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat May 28 18:43:57 2016 +0000
tree 13f349f7617dbfcfb7943ef97a83a1c1a91cd8ad
parent 8446284b02ddab002118842b60c3eca47699345d
parent 1059f37377fd37cc311db522b4b5689086480d17

Merge "Add build number to apps\' version name for non-platform build" into nyc-dev
am: 1059f37377

* commit '1059f37377fd37cc311db522b4b5689086480d17':
  Add build number to apps' version name for non-platform build

Change-Id: Ib3cbad8f4a242341319b9c3dbe0322588d63b4ea

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index a46dfbc..84ea801 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1833,6 +1833,10 @@
 
 # Add BUILD_NUMBER to apps default version name if it's unbundled build.
 ifdef TARGET_BUILD_APPS
+TARGET_BUILD_WITH_APPS_VERSION_NAME := true
+endif
+
+ifdef TARGET_BUILD_WITH_APPS_VERSION_NAME
 APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)
 else
 APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)