Commit adbf9bef authored by Yang Guo's avatar Yang Guo Committed by Commit Bot

base: remove ICU_DATA_SHARED option

R=jshin@chromium.org

Bug: chromium:938223
Change-Id: Ifa6392cd4d657e76d87f6a9f96c8ad610291cfef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1520406
Auto-Submit: Yang Guo <yangguo@chromium.org>
Reviewed-by: default avatarJungshik Shin <jshin@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662971}
parent 5008c41d
...@@ -44,13 +44,6 @@ ...@@ -44,13 +44,6 @@
namespace base { namespace base {
namespace i18n { namespace i18n {
#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED
#define ICU_UTIL_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
#if defined(OS_WIN)
#define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt.dll"
#endif
#endif
namespace { namespace {
#if !defined(OS_NACL) #if !defined(OS_NACL)
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
...@@ -260,30 +253,7 @@ bool InitializeICU() { ...@@ -260,30 +253,7 @@ bool InitializeICU() {
#endif #endif
bool result; bool result;
#if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED) #if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_STATIC)
FilePath data_path;
PathService::Get(DIR_ASSETS, &data_path);
data_path = data_path.AppendASCII(ICU_UTIL_DATA_SHARED_MODULE_NAME);
HMODULE module = LoadLibrary(data_path.value().c_str());
if (!module) {
LOG(ERROR) << "Failed to load " << ICU_UTIL_DATA_SHARED_MODULE_NAME;
return false;
}
FARPROC addr = GetProcAddress(module, ICU_UTIL_DATA_SYMBOL);
if (!addr) {
LOG(ERROR) << ICU_UTIL_DATA_SYMBOL << ": not found in "
<< ICU_UTIL_DATA_SHARED_MODULE_NAME;
return false;
}
UErrorCode err = U_ZERO_ERROR;
udata_setCommonData(reinterpret_cast<void*>(addr), &err);
// Never try to load ICU data from files.
udata_setFileAccess(UDATA_ONLY_PACKAGES, &err);
result = (err == U_ZERO_ERROR);
#elif (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_STATIC)
// The ICU data is statically linked. // The ICU data is statically linked.
result = true; result = true;
#elif (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE) #elif (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
......
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
#include "build/build_config.h" #include "build/build_config.h"
#define ICU_UTIL_DATA_FILE 0 #define ICU_UTIL_DATA_FILE 0
#define ICU_UTIL_DATA_SHARED 1 #define ICU_UTIL_DATA_STATIC 1
#define ICU_UTIL_DATA_STATIC 2
namespace base { namespace base {
namespace i18n { namespace i18n {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment