diff options
| author | jshin@chromium.org <jshin@chromium.org> | 2014-01-24 01:00:41 +0000 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-06-12 17:22:48 +0200 |
| commit | 0a07797d0adb98633044038761f7bfdcd8a03a41 (patch) | |
| tree | 009603f5bdf1093d0b36121bc7485b44044e374f /chromium/net/net.gyp | |
| parent | f004bde584ee3c5033802350bf62cc6829dcf070 (diff) | |
| download | qtwebengine-chromium-0a07797d0adb98633044038761f7bfdcd8a03a41.tar.gz | |
<chromium> [Backport] Enable icu_use_data_file on Windows
BUG=72633,337116
Review URL: https://codereview.chromium.org/99473012
Change-Id: I70c2a17ec8a69542c850089b09e19c5873470a1a
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'chromium/net/net.gyp')
| -rw-r--r-- | chromium/net/net.gyp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/chromium/net/net.gyp b/chromium/net/net.gyp index 69f482751c9..a9ceae21bc8 100644 --- a/chromium/net/net.gyp +++ b/chromium/net/net.gyp @@ -2188,14 +2188,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, ], }, @@ -2294,16 +2300,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, ], - }, - ], + }], ], }, { |