From 5455b09e9e1d76cba58624934e639564222ac994 Mon Sep 17 00:00:00 2001
From: zhuw <zhuw@codeaurora.org>
Date: Thu, 13 Dec 2018 10:07:07 +0800
Subject: Change version to 015

change version to 015

Change-Id: I4e98a3f8717f0d85915587f71c8fbd488a8137a0
CRs-Fixed:2353032
---
 version.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'version.mk')

diff --git a/version.mk b/version.mk
index 2ae76a392..ae04a1a52 100755
--- a/version.mk
+++ b/version.mk
@@ -40,7 +40,7 @@
 # base_version_build is 3 digits and auto-increment for fixing CR.
 base_version_major := 2
 base_version_minor := 02
-base_version_build := 014
+base_version_build := 015
 
 #####################################################
 #####################################################
-- 
cgit v1.2.3


From 4fc685f3217532da4d5d7bc0f2c8b289d1036c35 Mon Sep 17 00:00:00 2001
From: jinwu <jinwu@codeaurora.org>
Date: Thu, 27 Dec 2018 17:35:51 +0800
Subject: change to BUILD_NUMBER_FROM_FILE

Change-Id: Ic21f10e0568dc7637da676d6fa40e9062e4af6e9
---
 version.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'version.mk')

diff --git a/version.mk b/version.mk
index ae04a1a52..bf9ff6367 100755
--- a/version.mk
+++ b/version.mk
@@ -45,7 +45,7 @@ base_version_build := 015
 #####################################################
 #####################################################
 # Collect automatic version code parameters
-ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
+ifneq "" "$(filter eng.%,$(BUILD_NUMBER_FROM_FILE))"
   # This is an eng build
   base_version_buildtype := 0
 else
@@ -84,8 +84,8 @@ version_code_package := $(base_version_major)$(base_version_minor)$(base_version
 # - For eng build (t=0):     M.m.bbb eng.$(USER)-hh
 # - For build server (t=1):  M.m.bbb (nnnnnn-hh)
 #       where nnnnnn is the build number from the build server (no zero-padding)
-# On eng builds, the BUILD_NUMBER has the user and timestamp inline
-ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
+# On eng builds, the BUILD_NUMBER_FROM_FILE has the user and timestamp inline
+ifneq "" "$(filter eng.%,$(BUILD_NUMBER_FROM_FILE))"
   git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h)
   date_string := $$(date +%m%d%y_%H%M%S)
   version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density))
-- 
cgit v1.2.3