summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjinwu <jinwu@codeaurora.org>2018-12-27 17:35:51 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-01-07 23:50:38 -0800
commit4fc685f3217532da4d5d7bc0f2c8b289d1036c35 (patch)
tree124eb6d458a85554d475b38c5915cf42060b00dc
parent6eed2ca62fbaeb5b3e9684ade3d1dfb29f6f295b (diff)
downloadandroid_packages_apps_Snap-4fc685f3217532da4d5d7bc0f2c8b289d1036c35.zip
android_packages_apps_Snap-4fc685f3217532da4d5d7bc0f2c8b289d1036c35.tar.gz
android_packages_apps_Snap-4fc685f3217532da4d5d7bc0f2c8b289d1036c35.tar.bz2
change to BUILD_NUMBER_FROM_FILE
Change-Id: Ic21f10e0568dc7637da676d6fa40e9062e4af6e9
-rwxr-xr-xversion.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/version.mk b/version.mk
index ae04a1a..bf9ff63 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))