commit 633eb826b8c97731dfc5ef12c7bf78a63734275d
author Nick Chalko <nchalko@google.com> Tue Oct 03 10:16:37 2017 -0700
committer Nick Chalko <nchalko@google.com> Tue Oct 03 14:23:55 2017 -0700
tree d31e2adc1f9cce4f27ca07d30bee921032e33a3c
parent e420c9665d2f52edf92b38c884b5b8f332f6128b

Sync to match Live Channels 1.15(ncis)

aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad

Bug: 64021596
Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0

version.mk

diff --git a/version.mk b/version.mk
index f63f583..6886dc0 100644
--- a/version.mk
+++ b/version.mk
@@ -48,13 +48,13 @@
 
 base_version_major := 1
 # Change this for each branch
-base_version_minor := 11
+base_version_minor := 15
 
 # code_version_major will overflow at 22
 code_version_major := $(shell echo $$(($(base_version_major)+3)))
 
 # x86 and arm sometimes don't match.
-code_version_build := 011
+code_version_build := 007
 #####################################################
 #####################################################
 # Collect automatic version code parameters
@@ -96,7 +96,7 @@
 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)
+    date_string := $(shell date +%Y-%m-%d)
     version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density))
 else
     version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) ($(BUILD_NUMBER)-$(base_version_arch)$(base_version_density))