commit 6e7f8554fc6c057b70ee1832f0507a9df44c9a29
author Max Weninger <max.weninger@gmail.com> Tue Feb 02 17:46:56 2016 +0100
committer Gerrit Code Review <gerrit2@gerrit> Tue Feb 02 17:46:56 2016 +0100
tree 6f02775d2fa202dd071e0b11cc425372e58ead3b
parent 9ada8d60cd293f803ad900f67355c9d2a593c92d
parent e7a9f2be1e2e3fde9ae46f2e03a5d00bb044786c

Merge "omni: change default to name images with local date" into android-6.0

config/version.mk

diff --git a/config/version.mk b/config/version.mk
index e2d8d41..6b5201a 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -24,10 +24,10 @@
 ifdef BUILDTYPE_RELEASE
     ROM_VERSION := $(PLATFORM_VERSION)-$(TARGET_PRODUCT_SHORT)
 else
-ifeq ($(ROM_BUILDTIME_LOCAL),y)
-    ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d-%H%M%z)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
-else
+ifeq ($(ROM_BUILDTIME_UTC),y)
     ROM_VERSION := $(PLATFORM_VERSION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
+else
+    ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
 endif
 endif