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 /net/net.gyp | |
| 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 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/net.gyp b/net/net.gyp index 837cd13..00d5039 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -18,8 +18,8 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../sdch/sdch.gyp:sdch', '../third_party/bzip2/bzip2.gyp:bzip2', - '../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/modp_b64/modp_b64.gyp:modp_b64', '../third_party/zlib/zlib.gyp:zlib', 'net_resources', @@ -415,8 +415,8 @@ ], # Get U_STATIC_IMPLEMENTATION and -I directories on Linux. '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', ], }, ], @@ -556,7 +556,7 @@ # TODO(mark): Specifying this here shouldn't be necessary. [ 'OS == "win"', { 'dependencies': [ - '../third_party/icu38/icu38.gyp:icudata', + '../third_party/icu/icu.gyp:icudata', ], }, ], @@ -584,7 +584,7 @@ # TODO(mark): Specifying this here shouldn't be necessary. [ 'OS == "win"', { 'dependencies': [ - '../third_party/icu38/icu38.gyp:icudata', + '../third_party/icu/icu.gyp:icudata', ], }, ], |