From 474eba4c22486e9c7a46527261173f8a06ff663d 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 8c06c27400..f12b15ab67 100644
--- a/src/base/BUILD.gn
+++ b/src/base/BUILD.gn
@@ -2201,7 +2201,7 @@ 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_castos && !is_cast_android) {
+ 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 da5c4c967b..6462669026 100644
--- a/src/base/time/time.h
+++ b/src/base/time/time.h
@@ -840,6 +840,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);
@@ -847,6 +848,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 6f4ead4fb2..86ebdacdaf 100644
--- a/src/base/time/time_exploded_posix.cc
+++ b/src/base/time/time_exploded_posix.cc
@@ -133,7 +133,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)