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

Don\'t add BUILD_NUMBER to version for platform builds

Browse Source 
am: cc3d547961

* commit 'cc3d547961bf9115821c50ab616286a261e5d4fc':
  Don't add BUILD_NUMBER to version for platform builds
This commit is contained in:
Dan Willemsen
2015-10-29 21:33:35 +00:00
committed by android-build-merger
parent 12fc4d9e78 cc3d547961
commit 0c38f114c1
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version.mk
+5
View File
@@ -100,10 +100,12 @@ endif
version_code_package := $(base_version_major)$(base_version_minor)$(base_version_build)$(base_version_buildtype)$(base_version_arch)$(base_version_density) version_code_package := $(base_version_major)$(base_version_minor)$(base_version_build)$(base_version_buildtype)$(base_version_arch)$(base_version_density)
# The version name scheme for the package apk is: # The version name scheme for the package apk is:
# - For platform builds: M.m.bbb
# - For eng build (t=1): M.m.bbb eng.$(USER)-hh # - For eng build (t=1): M.m.bbb eng.$(USER)-hh
# - For build server (t=0): M.m.bbb (nnnnnn-hh) # - For build server (t=0): M.m.bbb (nnnnnn-hh)
# 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
ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
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)
@@ -111,6 +113,9 @@ ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
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)-$(base_version_arch)$(base_version_density))
endif endif
else # !TARGET_BUILD_APPS
version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build)
endif
# Cleanup the locals # Cleanup the locals
base_version_major := base_version_major :=