summaryrefslogtreecommitdiffstats
path: root/version.mk
diff options
context:
space:
mode:
authorDavid Ng <dave@codeaurora.org>2016-12-09 00:05:38 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-06 13:50:49 -0800
commit3dce002393a67e851f8806d3e08ad3dc03bd80e5 (patch)
tree401cc34233452849ccc194286ae2db12e1c8532f /version.mk
parent3f5570549617a8e3fd0821b3038c9f41d1876160 (diff)
downloadandroid_packages_apps_Snap-3dce002393a67e851f8806d3e08ad3dc03bd80e5.tar.gz
android_packages_apps_Snap-3dce002393a67e851f8806d3e08ad3dc03bd80e5.tar.bz2
android_packages_apps_Snap-3dce002393a67e851f8806d3e08ad3dc03bd80e5.zip
Disable module for pure AOSP configuration
Module requires framework changes not supported by pure AOSP configuration. Fix/add explicit string.h header reference. Change date stamp versioning logic to reduce incremental build time. Change-Id: I0bcb223a8d9672e7d9d2facdf46d6726b035d110
Diffstat (limited to 'version.mk')
-rw-r--r--version.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/version.mk b/version.mk
index 869c764ad..b9926f8b1 100644
--- a/version.mk
+++ b/version.mk
@@ -85,10 +85,10 @@ version_code_package := $(base_version_major)$(base_version_minor)$(base_version
# On eng builds, the BUILD_NUMBER has the user and timestamp inline
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)
+ date_string := $$(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
# Cleanup the locals