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 /net/net.gyp | |
| 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 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/net/net.gyp b/net/net.gyp index 9b10a414..a40f393 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -2235,14 +2235,20 @@ 'dns/dns_config_service_posix_unittest.cc', 'http/http_auth_gssapi_posix_unittest.cc', ], - # This is needed to trigger the dll copy step on windows. - # TODO(mark): Specifying this here shouldn't be necessary. 'dependencies': [ - '../third_party/icu/icu.gyp:icudata', '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', 'third_party/nss/ssl.gyp:libssl', ], + 'conditions': [ + [ 'icu_use_data_file_flag == 0', { + # This is needed to trigger the dll copy step on windows. + # TODO(mark): Specifying this here shouldn't be necessary. + 'dependencies': [ + '../third_party/icu/icu.gyp:icudata', + ], + }], + ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, @@ -2341,16 +2347,19 @@ ], }, ], - # This is needed to trigger the dll copy step on windows. - # TODO(mark): Specifying this here shouldn't be necessary. [ 'OS == "win"', { - 'dependencies': [ - '../third_party/icu/icu.gyp:icudata', + 'conditions': [ + [ 'icu_use_data_file_flag == 0', { + # This is needed to trigger the dll copy step on windows. + # TODO(mark): Specifying this here shouldn't be necessary. + 'dependencies': [ + '../third_party/icu/icu.gyp:icudata', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], - }, - ], + }], ], }, { |