diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 06:49:08 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 06:49:08 +0000 |
| commit | 28062949a94a61dbe4d2b17969446b36894be156 (patch) | |
| tree | fa29a1e59608d1708ef68ad03ee373e03f8da5e5 /base | |
| parent | 65caf738dd018cc2c61c35cda3bb8be2069791c8 (diff) | |
| download | chromium_src-28062949a94a61dbe4d2b17969446b36894be156.zip chromium_src-28062949a94a61dbe4d2b17969446b36894be156.tar.gz chromium_src-28062949a94a61dbe4d2b17969446b36894be156.tar.bz2 | |
Replace icu38/icu38.gyp with icu/icu.gyp in gyp files replace all the references to third_party/icu38 and icudt38.dll with third_party/icu and icudt42.dll in vsprops and cc files. Also, update the icu data module name and the icu data symbol in icu_util.cc
In addition, add a dummy C++ source file (xmldummy_mac.cc) to libxml to work around an Xcode bug (xmllint and xmlcatalog are linked with gcc rather than g++ even though it's linked to a "C++ library", libicuuc.a).
Also updated is the test results for net_util_unittests.
This will not be landed until deps/third_party/icu42 is ready for all 3 platforms (Windows VS build files are not yet updated there).
BUG=8198
TEST=On all platforms, all the targets are built fine.
Review URL: http://codereview.chromium.org/172031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 8 | ||||
| -rw-r--r-- | base/icu_util.cc | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/base/base.gyp b/base/base.gyp index a495d49..f6a7192 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -14,8 +14,8 @@ 'target_name': 'base', 'type': '<(library)', 'dependencies': [ - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', ], 'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165', 'sources': [ @@ -667,7 +667,7 @@ 'include_dirs': [ # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU # #include for unicode/uchar.h. This should probably be cleaned up. - '../third_party/icu38/public/common', + '../third_party/icu/public/common', ], 'dependencies': [ 'base', @@ -703,7 +703,7 @@ # TODO(mark): This should not be necessary. ['OS == "win"', { 'dependencies': [ - '../third_party/icu38/icu38.gyp:icudata', + '../third_party/icu/icu.gyp:icudata', ], 'sources!': [ 'data_pack_unittest.cc', diff --git a/base/icu_util.cc b/base/icu_util.cc index 0f42395..b885cd1 100644 --- a/base/icu_util.cc +++ b/base/icu_util.cc @@ -62,12 +62,17 @@ bool Initialize() { ASCIIToWide(ICU_UTIL_DATA_SHARED_MODULE_NAME)); HMODULE module = LoadLibrary(data_path.c_str()); - if (!module) + 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) + 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); |