commit 42efa85dc19e6c105012d67e7a331ec0b64609e4
author Colin Cross <ccross@google.com> Thu Jul 23 18:23:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 23 18:23:52 2015 +0000
tree ef77b4a5814b5a86a5a62245826886d132f391f0
parent 182c13c6767a1513ef998559bed684cbefc8e2c9
parent 6e53788364dee459a6f0ccd1f248a3689eb0bd41

Merge "Use build number from file"

version.mk

diff --git a/version.mk b/version.mk
index 869c764..b9926f8 100644
--- a/version.mk
+++ b/version.mk
@@ -85,10 +85,10 @@
 # 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