diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 21:50:36 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 21:50:36 +0000 |
| commit | f6f49490e29b04343a239dcb625c4e89dd02300f (patch) | |
| tree | 3bc042b02615c2215effe47300f9bf8a97f40c4f /chrome/tools | |
| parent | 36df22b48817bc7fe7159e498f65b5e8b00f1605 (diff) | |
| download | chromium_src-f6f49490e29b04343a239dcb625c4e89dd02300f.zip chromium_src-f6f49490e29b04343a239dcb625c4e89dd02300f.tar.gz chromium_src-f6f49490e29b04343a239dcb625c4e89dd02300f.tar.bz2 | |
ICU 4.6 upgrade chrome changes in phase 2
A bunch of hard-coded references to icudt42.dll are updated to
refer to icudt46.dll.
See also http://codereview.chromium.org/6575042/ (and there's one more accompanying CL - internal).
I'll follow up this CL with a change to rename icudtXX.dll to icudt.dll
so that I don't have to do this again next time.
BUG=73991,61514
TEST=daily archived builds have icudt46.dll
Review URL: http://codereview.chromium.org/6580046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/build/win/FILES | 2 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 2 | ||||
| -rw-r--r-- | chrome/tools/build/win/TESTS | 1 | ||||
| -rw-r--r-- | chrome/tools/build/win/server.rules | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index 34ab361..d9e7e6a 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -9,7 +9,7 @@ crash_service.exe First Run gears.dll ppGoogleNaClPluginChrome.dll -icudt42.dll +icudt46.dll locales/ar.dll locales/bg.dll locales/bn.dll diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 0336fde..a8f4034 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -66,7 +66,7 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { - 'filename': 'icudt42.dll', + 'filename': 'icudt46.dll', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, diff --git a/chrome/tools/build/win/TESTS b/chrome/tools/build/win/TESTS index a5a0deb..3656046 100644 --- a/chrome/tools/build/win/TESTS +++ b/chrome/tools/build/win/TESTS @@ -3,6 +3,7 @@ test_shell.exe automated_ui_tests.exe
icudt38.dll
icudt42.dll
+icudt46.dll
plugins\npTestNetscapePlugIn.dll
pyautolib.py
_pyautolib.pyd
diff --git a/chrome/tools/build/win/server.rules b/chrome/tools/build/win/server.rules index 6a1d870..d49f19d 100644 --- a/chrome/tools/build/win/server.rules +++ b/chrome/tools/build/win/server.rules @@ -9,7 +9,7 @@ DisplayName="Scan Server DLLs"
CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\scan_server_dlls.py --output_dir="$(OutDir)" --input_file="$(InputPath)" --header_output_dir="$(IntDir)" --distribution=$(CHROMIUM_BUILD)"
Outputs="$(OutDir)/registered_dlls.h;"
- AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt42.dll"
+ AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt46.dll"
FileExtensions="*.release"
ExecutionDescription="Scanning for COM Server DLLs..."
ShowOnlyRuleProperties="false"
|