Don\'t add BUILD_NUMBER to version for platform builds
am: cc3d547961
* commit 'cc3d547961bf9115821c50ab616286a261e5d4fc':
Don't add BUILD_NUMBER to version for platform builds
diff --git a/version.mk b/version.mk
index 7407993..6568cc8 100644
--- a/version.mk
+++ b/version.mk
@@ -100,10 +100,12 @@
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:
+# - For platform builds: M.m.bbb
# - For eng build (t=1): M.m.bbb eng.$(USER)-hh
# - For build server (t=0): M.m.bbb (nnnnnn-hh)
# 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))"
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)
@@ -111,6 +113,9 @@
else
version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER)-$(base_version_arch)$(base_version_density))
endif
+else # !TARGET_BUILD_APPS
+ version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build)
+endif
# Cleanup the locals
base_version_major :=