diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-02-22 02:36:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-22 02:36:51 +0000 |
| commit | a75e73b3b367eecc2bdea4f7fbfd88512fcc95fe (patch) | |
| tree | eb2ffc32d3631222ec1bb37a4d87f856ab055a24 | |
| parent | 777908546e47297618750d083bb89fe7d98f4853 (diff) | |
| parent | 6d35e804a68535a76c9ba8dad6ca3d84e6ba0022 (diff) | |
| download | TV-a75e73b3b367eecc2bdea4f7fbfd88512fcc95fe.tar.gz | |
Use HAS_BUILD_NUMBER to check engineering build am: 9d03eaf85c am: 83c538af11
am: 6d35e804a6
Change-Id: I55998a189e2e95a5d3b928c3cc7d9849082a3937
| -rw-r--r-- | version.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -58,7 +58,7 @@ code_version_build := 001 ##################################################### ##################################################### # 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) |