filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use HAS_BUILD_NUMBER to check engineering build

Browse Source 
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build
reruns.

Test: m -j32
Bug: b/70351683
Change-Id: Ic5fcd5def203de9c3022039fbdbaa866935301e8
This commit is contained in:
Nan Zhang
2018-02-20 13:28:22 -08:00
parent 86e0cae74b
commit 3dd036dc99
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
version.mk
View File

@@ -55,7 +55,7 @@ base_version_build := 001
##################################################### #####################################################
##################################################### #####################################################
# Collect automatic version code parameters # Collect automatic version code parameters
ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
# This is an eng build # This is an eng build
base_version_buildtype := 0 base_version_buildtype := 0
else 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) # 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 # On eng builds, the BUILD_NUMBER has the user and timestamp inline
ifdef TARGET_BUILD_APPS 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) 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) 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)) 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 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 endif
else # !TARGET_BUILD_APPS else # !TARGET_BUILD_APPS
version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build)