summaryrefslogtreecommitdiffstats
path: root/version.mk
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2019-02-26 23:10:34 +0000
committerBruno Martins <bgcngm@gmail.com>2019-03-01 22:04:56 +0000
commit39f672bedd8263930d5595b4f7fbc371ef7aba4a (patch)
treea3e672b3d23ff9e634738b3b274d280d14dd6701 /version.mk
parent0b449ed17e510e47ac281ac1d636847464ab8b72 (diff)
parent3f64df28512b6d30787383262bc4ab27c9152e35 (diff)
downloadandroid_packages_apps_Snap-39f672bedd8263930d5595b4f7fbc371ef7aba4a.zip
android_packages_apps_Snap-39f672bedd8263930d5595b4f7fbc371ef7aba4a.tar.gz
android_packages_apps_Snap-39f672bedd8263930d5595b4f7fbc371ef7aba4a.tar.bz2
Merge tag 'LA.UM.7.3.r1-06900-sdm845.0' into HEAD
"LA.UM.7.3.r1-06900-sdm845.0" Change-Id: I4e8868d30070d938f48d98858a484607555649f3
Diffstat (limited to 'version.mk')
-rwxr-xr-xversion.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/version.mk b/version.mk
index 2ae76a3..bf9ff63 100755
--- a/version.mk
+++ b/version.mk
@@ -40,12 +40,12 @@
# 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
#####################################################
#####################################################
# 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))