Merge "Make deqp build reproducible" into nyc-dev

am: cf18b0408c

* commit 'cf18b0408c4407d0d7cdec9c5a7193550f0aeee8':
  Make deqp build reproducible

diff --git a/Android.mk b/Android.mk
index f9aaa76..7a15c0b 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -887,8 +887,7 @@ LOCAL_STATIC_LIBRARIES := \
                libpng_ndk \
 
 LOCAL_CFLAGS += \
-       $(deqp_compile_flags) \
-       -Wno-error=date-time
+       $(deqp_compile_flags)
 
 LOCAL_SDK_VERSION := 9
 LOCAL_CPPFLAGS += -Wno-non-virtual-dtor

diff --git a/modules/internal/ditBuildInfoTests.cpp b/modules/internal/ditBuildInfoTests.cpp
index 1cbd4c5..480d84a 100644 (file)
--- a/modules/internal/ditBuildInfoTests.cpp
+++ b/modules/internal/ditBuildInfoTests.cpp
@@ -187,8 +187,6 @@ void BuildInfoTests::init (void)
        const bool isDebug = false;
 #endif
 
-       addChild(new BuildInfoStringCase                (m_testCtx, "date",                                             "__DATE__",                     __DATE__));
-       addChild(new BuildInfoStringCase                (m_testCtx, "time",                                             "__TIME__",                     __TIME__));
        addChild(new BuildInfoStringCase                (m_testCtx, "de_debug",                                 "DE_DEBUG",                     isDebug ? "1" : "not defined"));
        addChild(new BuildEnumCase                              (m_testCtx, "de_os",                                    "DE_OS",                        DE_OS,                                                                  getOsName));
        addChild(new BuildEnumCase                              (m_testCtx, "de_cpu",                                   "DE_CPU",                       DE_CPU,                                                                 getCpuName));