diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-24 01:00:41 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-24 01:00:41 +0000 |
| commit | 27be5064de59003547d02489cda61caaee56b031 (patch) | |
| tree | 2c5ffbda3f70255da36bd9dfbd1285a91874f1fc /chrome/installer/mini_installer.gypi | |
| parent | fea05b4d9fb69f2cf367d9bc18c53700b9c5cff3 (diff) | |
| download | chromium_src-27be5064de59003547d02489cda61caaee56b031.zip chromium_src-27be5064de59003547d02489cda61caaee56b031.tar.gz chromium_src-27be5064de59003547d02489cda61caaee56b031.tar.bz2 | |
Enable icu_use_data_file on Windows
Set icu_use_data_file_flag to 1 on Windows in common.gypi and make the dependency on icudata conditional on 'icu_use_data_file_flag != 0' in common.gypi, base.gyp and net.gyp
Add icudtl.dat to the Windows build/archive/install file lists.
Load icudtl.dat from DIR_MODULE instead of DIR_EXE on Windows. (to fix bug 337116)
This also requires a change in third_party/icu/icu.gyp
( https://codereview.chromium.org/111723007/ ), which was rolled in by https://codereview.chromium.org/118313004/
BUG=72633,337116
TEST=All windows builds work fine and there's no perf regression (start-up etc). Chrome installed via mini_installer runs fine (no issue with icu data file).
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=246387
Review URL: https://codereview.chromium.org/99473012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer.gypi')
| -rw-r--r-- | chrome/installer/mini_installer.gypi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi index 72e5047..6f2402d 100644 --- a/chrome/installer/mini_installer.gypi +++ b/chrome/installer/mini_installer.gypi @@ -185,6 +185,15 @@ 'target_arch_flag': '--target_arch=x86', }, }], + ['icu_use_data_file_flag == 0', { + 'inputs': [ + '<(PRODUCT_DIR)/icudt.dll', + ], + }, { # else icu_use_data_file_flag != 0 + 'inputs': [ + '<(PRODUCT_DIR)/icudtl.dat', + ], + }], ], 'inputs': [ '<(create_installer_archive_py_path)', @@ -195,7 +204,6 @@ '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', '<(PRODUCT_DIR)/locales/en-US.pak', - '<(PRODUCT_DIR)/icudt.dll', ], 'outputs': [ 'xxx.out', |