commit 7bf10eafc8119e491979537807de156260dba87e
author Lance Chang <jinwoong@google.com> Sat May 28 18:56:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat May 28 18:56:16 2016 +0000
tree c6a7d53e35749e0ddf208842e614d0be8125d88f
parent 0004b06e254a9c8feb4597ed266010997e4f4543
parent ac88564f7aac12b67478deff48feae85126c1ee6

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

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

Change-Id: Iafff4a5776c456a0dee1e4eaf2d484567640f2d4

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 84fe8e9..4573bdd 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1928,6 +1928,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)