Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index 876b61eb24f446ad0e0532c0aac4691b93b571b2..5e9cc4390265f3155aa59f0572451c482241c9ff 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -2218,14 +2218,21 @@ |
'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, ], |
}, |
@@ -2324,9 +2331,9 @@ |
], |
}, |
], |
- # This is needed to trigger the dll copy step on windows. |
- # TODO(mark): Specifying this here shouldn't be necessary. |
- [ 'OS == "win"', { |
+ [ 'OS == "win" and 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', |
], |