From b792cd7396313b356ab91c77c414f4e6c9343482 Mon Sep 17 00:00:00 2001
From: klzgrad <kizdiv@gmail.com>
Date: Wed, 18 Nov 2020 22:51:53 +0800
Subject: [PATCH] base: 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, 4 insertions(+), 2 deletions(-)

diff --git a/src/base/BUILD.gn b/src/base/BUILD.gn
index 838b171fe1..abda88c076 100644
--- a/src/base/BUILD.gn
+++ b/src/base/BUILD.gn
@@ -2333,7 +2333,7 @@ component("base") {
     # headers which allows representing time as int64, which makes this entire
     # problem moot. Hence, why `!is_cronet_build` flag has been added.
     # See crbug.com/431972096#comment10 for more information.
-    if (!is_castos && !is_cast_android && !is_cronet_build) {
+    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 d21e4da349..2f1da1920f 100644
--- a/src/base/time/time.h
+++ b/src/base/time/time.h
@@ -845,6 +845,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);
@@ -852,6 +853,7 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> {
       bool is_local,
       const Exploded& exploded,
       int64_t* millis_since_unix_epoch);
+#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 073b27e40f..4aa65fb138 100644
--- a/src/base/time/time_exploded_posix.cc
+++ b/src/base/time/time_exploded_posix.cc
@@ -130,7 +130,7 @@ void Time::Explode(bool is_local, Exploded* exploded) const {
   if (sizeof(SysTime) < 8) {
 // TODO(b/167763382) Find an alternate solution for Chromecast devices, since
 // adding the icui18n dep significantly increases the binary size.
-#if !BUILDFLAG(IS_CASTOS) && !BUILDFLAG(IS_CAST_ANDROID)
+#if 0
     ExplodeUsingIcu(millis_since_unix_epoch, is_local, exploded);
     return;
 #endif  // !BUILDFLAG(IS_CASTOS) && !BUILDFLAG(IS_CAST_ANDROID)