Add Starboard ICU initialization (#3145)

b/332735376 Change-Id: I303a1c37fd4b313ac4952f3e22096e74c33cc3ca
youtube · May 7, 2024 · 5327e5f · 5327e5f
1 parent 43f89aa
commit 5327e5f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/base/BUILD.gn b/base/BUILD.gn
@@ -2786,6 +2786,7 @@ component("i18n") {
     "//base/third_party/dynamic_annotations",
     "//build:chromecast_buildflags",
     "//build:chromeos_buildflags",
+    "//starboard/client_porting/icu_init",
   ]
 
   if (is_starboard) {

diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
@@ -56,6 +56,11 @@
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 #endif
 
+#if defined(STARBOARD)
+#include "starboard/client_porting/icu_init/icu_init.h"
+#include "starboard/types.h"
+#endif
+
 namespace base::i18n {
 
 #if !BUILDFLAG(IS_NACL)
@@ -418,6 +423,10 @@ void SetIcuTimeZoneDataDirForTesting(const char* dir) {
 #endif  // (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
 
 bool InitializeICU() {
+#if defined(STARBOARD)
+  IcuInit();
+  return true;
+#else
 #if DCHECK_IS_ON()
   DCHECK(!g_check_called_once || !g_called_once);
   g_called_once = true;
@@ -433,6 +442,7 @@ bool InitializeICU() {
 #endif  // (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_STATIC)
 
   return DoCommonInitialization();
+#endif  // defined(STARBOARD)
 }
 
 void AllowMultipleInitializeCallsForTesting() {