diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-02-20 13:28:22 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-02-21 10:34:30 -0800 |
| commit | 3dd036dc9973f3cf10768d66e892d152a58c6dee (patch) | |
| tree | 41d45ac038ff397de534864cc7544595b77116e2 /version.mk | |
| parent | 86e0cae74b46333cc27ac38eedf95220c696d4df (diff) | |
| download | android_packages_apps_Messaging-3dd036dc9973f3cf10768d66e892d152a58c6dee.tar.gz android_packages_apps_Messaging-3dd036dc9973f3cf10768d66e892d152a58c6dee.tar.bz2 android_packages_apps_Messaging-3dd036dc9973f3cf10768d66e892d152a58c6dee.zip | |
Use HAS_BUILD_NUMBER to check engineering build
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build
reruns.
Test: m -j32
Bug: b/70351683
Change-Id: Ic5fcd5def203de9c3022039fbdbaa866935301e8
Diffstat (limited to 'version.mk')
| -rw-r--r-- | version.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -55,7 +55,7 @@ base_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 @@ -106,12 +106,12 @@ version_code_package := $(base_version_major)$(base_version_minor)$(base_version # 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 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 +%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)) else - version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER)-$(base_version_arch)$(base_version_density)) + version_name_package := $(base_version_major).$(base_version_minor).$(base_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).$(base_version_build) |