From: Dan Willemsen <dwillemsen@google.com>
Date: Wed, 6 Jan 2016 00:38:56 +0000 (+0000)
Subject: Merge "Use -Wno-date-time to allow __DATE__/__TIME__" am: bd1826b4a3
X-Git-Tag: upstream/0.1.0~1311
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3d988aab70b74c98ce51d7345eac519ad5c9222;hp=661fef704eeecc3d83997bffc2615b19e68efa81;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge "Use -Wno-date-time to allow __DATE__/__TIME__" am: bd1826b4a3
am: f4e3b26175

* commit 'f4e3b26175490978db76e76576b488cbe2cf6bb6':
  Use -Wno-date-time to allow __DATE__/__TIME__
---

diff --git a/Android.mk b/Android.mk
index ba09272..586308c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -739,7 +739,8 @@ LOCAL_SHARED_LIBRARIES := \
 		libdl
 
 LOCAL_CFLAGS += \
-	$(deqp_compile_flags)
+	$(deqp_compile_flags) \
+	-Wno-date-time
 
 LOCAL_SDK_VERSION := 9
 LOCAL_CPPFLAGS += -Wno-non-virtual-dtor