From aef86f7f4ce651343f5eb4be2d6b0932c030f1fe Mon Sep 17 00:00:00 2001
From: Lance Chang <jinwoong@google.com>
Date: Thu, 26 May 2016 12:32:30 -0700
Subject: [PATCH] Add build number to apps' version name for non-platform build

If TARGET_BUILD_WITH_APPS_VERSION_NAME is defined, the build system
will add build number to the apps' default version name.

Bug: 28982976
Change-Id: I536f273b557fe7c935cc4ef1052c3297f8029863
---
 core/definitions.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/definitions.mk b/core/definitions.mk
index e2d5de4f0..b9ef4d57f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1830,6 +1830,10 @@ endef
 
 # 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)