Commit 594ceb45 authored by sebmarchand's avatar sebmarchand Committed by Commit bot

Remove a reference to __DATE__ and __TIME__ from nss for non official builds.

BUG=314403

Review URL: https://codereview.chromium.org/691193002

Cr-Commit-Position: refs/heads/master@{#302185}
parent 371e283a
......@@ -52,3 +52,6 @@ patch -p4 < $patches_dir/paddingextvalue.patch
patch -p4 < $patches_dir/reorderextensions.patch
patch -p5 < $patches_dir/alpnserver.patch
patch -p4 < $patches_dir/removebuildmetadata.patch
diff --git a/net/third_party/nss/ssl/sslver.c b/net/third_party/nss/ssl/sslver.c
index 35e0317..ea60888 100644
--- a/net/third_party/nss/ssl/sslver.c
+++ b/net/third_party/nss/ssl/sslver.c
@@ -12,6 +12,13 @@
#define _DEBUG_STRING ""
#endif
+#if defined(DONT_EMBED_BUILD_METADATA) && !defined(OFFICIAL_BUILD)
+#define _DATE_AND_TIME "Sep 02 2008 08:00:00"
+#else
+#define _DATE_AND_TIME __DATE__ " " __TIME__
+#endif
+
+
/*
* Version information for the 'ident' and 'what commands
*
@@ -19,6 +26,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
const char __nss_ssl_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__ " $";
+ " " _DATE_AND_TIME " $";
const char __nss_ssl_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
- " " __DATE__ " " __TIME__;
+ " " _DATE_AND_TIME;
......@@ -12,6 +12,12 @@
#define _DEBUG_STRING ""
#endif
#if defined(DONT_EMBED_BUILD_METADATA) && !defined(OFFICIAL_BUILD)
#define _DATE_AND_TIME "Sep 02 2008 08:00:00"
#else
#define _DATE_AND_TIME __DATE__ " " __TIME__
#endif
/*
* Version information for the 'ident' and 'what commands
*
......@@ -19,6 +25,6 @@
* must not end in a '$' to prevent rcs keyword substitution.
*/
const char __nss_ssl_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
" " __DATE__ " " __TIME__ " $";
" " _DATE_AND_TIME " $";
const char __nss_ssl_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
" " __DATE__ " " __TIME__;
" " _DATE_AND_TIME;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment