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 /webkit | |
| 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 'webkit')
| -rw-r--r-- | webkit/default_plugin/default_plugin.gyp | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 2 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp index 1b06416..06e9095 100644 --- a/webkit/default_plugin/default_plugin.gyp +++ b/webkit/default_plugin/default_plugin.gyp @@ -16,8 +16,8 @@ 'type': '<(library)', 'dependencies': [ '../../net/net.gyp:net_resources', - '../../third_party/icu38/icu38.gyp:icui18n', - '../../third_party/icu38/icu38.gyp:icuuc', + '../../third_party/icu/icu.gyp:icui18n', + '../../third_party/icu/icu.gyp:icuuc', '../../third_party/libxml/libxml.gyp:libxml', '../../third_party/npapi/npapi.gyp:npapi', '../webkit.gyp:webkit_resources', diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 81e65e9..f7540fb 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -494,7 +494,7 @@ 'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6', 'dependencies': [ '../../../base/base.gyp:base', - '../../../third_party/icu38/icu38.gyp:icuuc', + '../../../third_party/icu/icu.gyp:icuuc', '../../../third_party/npapi/npapi.gyp:npapi', ], 'sources': [ diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index f1bb332..abd28b3 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -235,8 +235,8 @@ 'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6', 'dependencies': [ 'config', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', ], 'include_dirs': [ '../third_party/WebKit/JavaScriptCore', @@ -263,8 +263,8 @@ }, 'export_dependent_settings': [ 'config', - '../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_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706], 'conditions': [ |