commit ac88564f7aac12b67478deff48feae85126c1ee6
author Lance Jin-woong Chang <jinwoong@google.com> Sat May 28 18:53:09 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat May 28 18:53:09 2016 +0000
tree 2e01b98697319947faebe94dfabe689098ab68d1
parent e041121fba0b586f92f832698836dfe906673d5f
parent df1fff12fe1a844b7ed86b95d478fccb266b1ae6

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

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

Change-Id: If61ed8d22cd261ed0492fcf6995952f4e2c38199

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)