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 /build | |
| 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 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp index d5db99a..812e72b 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -26,7 +26,7 @@ '../third_party/bzip2/bzip2.gyp:*', '../third_party/codesighs/codesighs.gyp:*', '../third_party/ffmpeg/ffmpeg.gyp:*', - '../third_party/icu38/icu38.gyp:*', + '../third_party/icu/icu.gyp:*', '../third_party/libjpeg/libjpeg.gyp:*', '../third_party/libpng/libpng.gyp:*', '../third_party/libxml/libxml.gyp:*', diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index 4f0dac0..4fbab83 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -17,9 +17,9 @@ 'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C', 'dependencies': [ '../../base/base.gyp:base', - '../../third_party/icu38/icu38.gyp:icudata', - '../../third_party/icu38/icu38.gyp:icui18n', - '../../third_party/icu38/icu38.gyp:icuuc', + '../../third_party/icu/icu.gyp:icudata', + '../../third_party/icu/icu.gyp:icui18n', + '../../third_party/icu/icu.gyp:icuuc', ], 'sources': [ '../../googleurl/src/gurl.cc', @@ -62,7 +62,7 @@ 'dependencies': [ 'googleurl', '../../testing/gtest.gyp:gtest', - '../../third_party/icu38/icu38.gyp:icuuc', + '../../third_party/icu/icu.gyp:icuuc', ], 'sources': [ '../../googleurl/src/gurl_unittest.cc', |