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 (file)
--- 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