summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 06:49:08 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 06:49:08 +0000
commit28062949a94a61dbe4d2b17969446b36894be156 (patch)
treefa29a1e59608d1708ef68ad03ee373e03f8da5e5 /printing
parent65caf738dd018cc2c61c35cda3bb8be2069791c8 (diff)
downloadchromium_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 'printing')
-rw-r--r--printing/printing.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 3e40dd1..c10b92b 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -19,8 +19,8 @@
'../base/base.gyp:base_gfx',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../skia/skia.gyp:skia',
- '../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': '9E5416B9-B91B-4029-93F4-102C1AD5CAF4',
'include_dirs': [