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 /chrome/installer | |
| 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 'chrome/installer')
| -rw-r--r-- | chrome/installer/installer.gyp | 4 | ||||
| -rwxr-xr-x | chrome/installer/mini_installer.gyp | 2 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 3c6e1f7..2997b2d 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -23,8 +23,8 @@ '../chrome.gyp:chrome_strings', '../../courgette/courgette.gyp:courgette_lib', '../../third_party/bspatch/bspatch.gyp:bspatch', - '../../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/lzma_sdk/lzma_sdk.gyp:lzma_sdk', ], diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 229c994..4389884 100755 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -157,7 +157,7 @@ '<(PRODUCT_DIR)/chrome.exe', '<(PRODUCT_DIR)/chrome.dll', '<(PRODUCT_DIR)/locales/en-US.dll', - '<(PRODUCT_DIR)/icudt38.dll', + '<(PRODUCT_DIR)/icudt42.dll', ], 'outputs': [ 'xxx.out', diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index cb675d7..20705f1 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -32,7 +32,7 @@ chrome.exe: %(ChromeDir)s\ wow_helper.exe: %(ChromeDir)s\ Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries chrome.dll: %(VersionDir)s\ -icudt38.dll: %(VersionDir)s\ +icudt42.dll: %(VersionDir)s\ gears.dll: %(VersionDir)s\ Themes\default.dll: %(VersionDir)s\Themes locales\*.dll: %(VersionDir)s\Locales |