From 6f7946adc221dc22dd2ce163be212aa7ba6d9c86 Mon Sep 17 00:00:00 2001
From: klzgrad <kizdiv@gmail.com>
Date: Wed, 18 Nov 2020 22:51:53 +0800
Subject: [PATCH] build: Don't fix Y2038 problem with icu

---
 src/base/BUILD.gn                    | 2 +-
 src/base/time/time.h                 | 2 ++
 src/base/time/time_exploded_posix.cc | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/base/BUILD.gn b/src/base/BUILD.gn
index 3138c97d8f..e437a8400c 100644
--- a/src/base/BUILD.gn
+++ b/src/base/BUILD.gn
@@ -2164,7 +2164,7 @@ component("base") {
 
     # TODO(b/167763382) Find an alternate solution for Chromecast devices, since
     # adding the icui18n dep significantly increases the binary size.
-    if (!is_chromecast) {
+    if (false) {
       sources += [ "time/time_exploded_icu.cc" ]
 
       # The ICU dependency is only needed on systems with a 32-bit time_t.
diff --git a/src/base/time/time.h b/src/base/time/time.h
index f93f07fd83..5830189772 100644
--- a/src/base/time/time.h
+++ b/src/base/time/time.h
@@ -792,6 +792,7 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> {
 
   // Some platforms use the ICU library to provide To/FromExploded, when their
   // native library implementations are insufficient in some way.
+#if 0
   static void ExplodeUsingIcu(int64_t millis_since_unix_epoch,
                               bool is_local,
                               Exploded* exploded);
@@ -799,6 +800,7 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> {
                                    const Exploded& exploded,
                                    int64_t* millis_since_unix_epoch)
       WARN_UNUSED_RESULT;
+#endif
 
   // Rounds down the time to the nearest day in either local time
   // |is_local = true| or UTC |is_local = false|.
diff --git a/src/base/time/time_exploded_posix.cc b/src/base/time/time_exploded_posix.cc
index 486b2ef4d9..a01cd74304 100644
--- a/src/base/time/time_exploded_posix.cc
+++ b/src/base/time/time_exploded_posix.cc
@@ -125,6 +125,7 @@ void Time::Explode(bool is_local, Exploded* exploded) const {
   const int64_t millis_since_unix_epoch =
       ToRoundedDownMillisecondsSinceUnixEpoch();
 
+#if 0
   // For systems with a Y2038 problem, use ICU as the Explode() implementation.
   if (sizeof(SysTime) < 8) {
 // TODO(b/167763382) Find an alternate solution for Chromecast devices, since
@@ -134,6 +135,7 @@ void Time::Explode(bool is_local, Exploded* exploded) const {
     return;
 #endif  // !BUILDFLAG(IS_CHROMECAST)
   }
+#endif
 
   // Split the |millis_since_unix_epoch| into separate seconds and millisecond
   // components because the platform calendar-explode operates at one-second