From fc7d27cf6b0275eba29dbe60243addafb71c2e8d 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 7444fc8f15..5bb0ee73be 100644
--- a/src/base/BUILD.gn
+++ b/src/base/BUILD.gn
@@ -2199,7 +2199,7 @@ mixed_component("base") {
# TODO(b/167763382) Find an alternate solution for Chromecast devices, since
# adding the icui18n and icuuc deps 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 4cfa619a18..f941f02a5d 100644
--- a/src/base/time/time.h
+++ b/src/base/time/time.h
@@ -808,6 +808,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);
@@ -815,6 +816,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 e769489de8..bebf7beeea 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_CHROMECAST)
+#if 0
ExplodeUsingIcu(millis_since_unix_epoch, is_local, exploded);
return;
#endif // !BUILDFLAG(IS_CHROMECAST)