diff options
| -rw-r--r-- | version.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -58,7 +58,7 @@ code_version_build := 007 ##################################################### ##################################################### # Collect automatic version code parameters -ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" +ifeq ($(strip $(HAS_BUILD_NUMBER)),false) # This is an eng build base_version_buildtype := 0 else @@ -94,12 +94,12 @@ version_code_package := $(code_version_major)$(base_version_minor)$(code_version # and hh is the git hash # On eng builds, the BUILD_NUMBER has the user and timestamp inline ifdef TARGET_BUILD_APPS -ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" +ifeq ($(strip $(HAS_BUILD_NUMBER)),false) git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h) date_string := $(shell date +%Y-%m-%d) version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density)) else - version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) ($(BUILD_NUMBER)-$(base_version_arch)$(base_version_density)) + version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density)) endif else # !TARGET_BUILD_APPS version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) |