diff options
| author | bradnelson <bradnelson@google.com> | 2015-03-24 14:03:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-24 21:04:32 +0000 |
| commit | 961324d2110aaba0302b72ec88a78e7c36e4dfdd (patch) | |
| tree | faf95b6e78b329087693132b60b89ec8a1aa6bc2 /base/i18n | |
| parent | 87ba87f5a758cfe8252a591984db7f7ad8a29be4 (diff) | |
| download | chromium_src-961324d2110aaba0302b72ec88a78e7c36e4dfdd.zip chromium_src-961324d2110aaba0302b72ec88a78e7c36e4dfdd.tar.gz chromium_src-961324d2110aaba0302b72ec88a78e7c36e4dfdd.tar.bz2 | |
Fixing debug GN build.
Gate out ICU initialization for OS_NACL,
as it calls other code that is not built for nacl.
Undetected in gyp build since we always build the nacl irt as release
with gc-sections.
Stop building the ppb_var_deprecated_proxy as it's only used in the
trusted build for flash.
Undetected in gyp build since we always build the nacl irt as release
with gc-sections.
BUG=https://code.google.com/p/chromium/issues/detail?id=462791
TEST=trybots
R=dmichael@chromium.org,dpranke@chromium.org
Review URL: https://codereview.chromium.org/1034553002
Cr-Commit-Position: refs/heads/master@{#322070}
Diffstat (limited to 'base/i18n')
| -rw-r--r-- | base/i18n/icu_util.cc | 4 | ||||
| -rw-r--r-- | base/i18n/icu_util.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc index f1fdda7..8bbbc04 100644 --- a/base/i18n/icu_util.cc +++ b/base/i18n/icu_util.cc @@ -48,7 +48,9 @@ namespace { // Assert that we are not called more than once. Even though calling this // function isn't harmful (ICU can handle it), being called twice probably // indicates a programming error. +#if !defined(OS_NACL) bool g_called_once = false; +#endif bool g_check_called_once = true; #endif } @@ -81,6 +83,7 @@ bool InitializeICUWithFileDescriptor( #endif +#if !defined(OS_NACL) bool InitializeICU() { #if !defined(NDEBUG) DCHECK(!g_check_called_once || !g_called_once); @@ -158,6 +161,7 @@ bool InitializeICU() { return err == U_ZERO_ERROR; #endif } +#endif void AllowMultipleInitializeCallsForTesting() { #if !defined(NDEBUG) diff --git a/base/i18n/icu_util.h b/base/i18n/icu_util.h index 5094cb0..e9f7c3d 100644 --- a/base/i18n/icu_util.h +++ b/base/i18n/icu_util.h @@ -14,9 +14,11 @@ namespace i18n { BASE_I18N_EXPORT extern const char kIcuDataFileName[]; +#if !defined(OS_NACL) // Call this function to load ICU's data tables for the current process. This // function should be called before ICU is used. BASE_I18N_EXPORT bool InitializeICU(); +#endif #if defined(OS_ANDROID) // Android uses a file descriptor passed by browser process to initialize ICU |