Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(915)

Side by Side Diff: net/net.gyp

Issue 99473012: Enable icu_use_data_file on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: load icudtl.dat in DIR_MODULE instead of DIR_EXE on WIndows Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/tools/build/win/TESTS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 2217 matching lines...) Expand 10 before | Expand all | Expand 10 after
2228 'dns/mdns_query_unittest.cc', 2228 'dns/mdns_query_unittest.cc',
2229 'dns/record_parsed_unittest.cc', 2229 'dns/record_parsed_unittest.cc',
2230 'dns/record_rdata_unittest.cc', 2230 'dns/record_rdata_unittest.cc',
2231 ], 2231 ],
2232 }], 2232 }],
2233 [ 'OS == "win"', { 2233 [ 'OS == "win"', {
2234 'sources!': [ 2234 'sources!': [
2235 'dns/dns_config_service_posix_unittest.cc', 2235 'dns/dns_config_service_posix_unittest.cc',
2236 'http/http_auth_gssapi_posix_unittest.cc', 2236 'http/http_auth_gssapi_posix_unittest.cc',
2237 ], 2237 ],
2238 # This is needed to trigger the dll copy step on windows.
2239 # TODO(mark): Specifying this here shouldn't be necessary.
2240 'dependencies': [ 2238 'dependencies': [
2241 '../third_party/icu/icu.gyp:icudata',
2242 '../third_party/nss/nss.gyp:nspr', 2239 '../third_party/nss/nss.gyp:nspr',
2243 '../third_party/nss/nss.gyp:nss', 2240 '../third_party/nss/nss.gyp:nss',
2244 'third_party/nss/ssl.gyp:libssl', 2241 'third_party/nss/ssl.gyp:libssl',
2245 ], 2242 ],
2243 'conditions': [
2244 [ 'icu_use_data_file_flag == 0', {
2245 # This is needed to trigger the dll copy step on windows.
2246 # TODO(mark): Specifying this here shouldn't be necessary.
2247 'dependencies': [
2248 '../third_party/icu/icu.gyp:icudata',
2249 ],
2250 }],
2251 ],
2246 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2252 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2247 'msvs_disabled_warnings': [4267, ], 2253 'msvs_disabled_warnings': [4267, ],
2248 }, 2254 },
2249 ], 2255 ],
2250 [ 'OS == "mac"', { 2256 [ 'OS == "mac"', {
2251 'dependencies': [ 2257 'dependencies': [
2252 '../third_party/nss/nss.gyp:nspr', 2258 '../third_party/nss/nss.gyp:nspr',
2253 '../third_party/nss/nss.gyp:nss', 2259 '../third_party/nss/nss.gyp:nss',
2254 'third_party/nss/ssl.gyp:libssl', 2260 'third_party/nss/ssl.gyp:libssl',
2255 ], 2261 ],
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
2334 [ 'use_v8_in_net==1', { 2340 [ 'use_v8_in_net==1', {
2335 'dependencies': [ 2341 'dependencies': [
2336 'net_with_v8', 2342 'net_with_v8',
2337 ], 2343 ],
2338 }, { # else: !use_v8_in_net 2344 }, { # else: !use_v8_in_net
2339 'sources!': [ 2345 'sources!': [
2340 'proxy/proxy_resolver_perftest.cc', 2346 'proxy/proxy_resolver_perftest.cc',
2341 ], 2347 ],
2342 }, 2348 },
2343 ], 2349 ],
2344 # This is needed to trigger the dll copy step on windows.
2345 # TODO(mark): Specifying this here shouldn't be necessary.
2346 [ 'OS == "win"', { 2350 [ 'OS == "win"', {
2347 'dependencies': [ 2351 'conditions': [
2348 '../third_party/icu/icu.gyp:icudata', 2352 [ 'icu_use_data_file_flag == 0', {
2353 # This is needed to trigger the dll copy step on windows.
2354 # TODO(mark): Specifying this here shouldn't be necessary.
2355 'dependencies': [
2356 '../third_party/icu/icu.gyp:icudata',
2357 ],
2358 }],
2349 ], 2359 ],
2350 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2360 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2351 'msvs_disabled_warnings': [4267, ], 2361 'msvs_disabled_warnings': [4267, ],
2352 }, 2362 }],
2353 ],
2354 ], 2363 ],
2355 }, 2364 },
2356 { 2365 {
2357 'target_name': 'net_test_support', 2366 'target_name': 'net_test_support',
2358 'type': 'static_library', 2367 'type': 'static_library',
2359 'dependencies': [ 2368 'dependencies': [
2360 '../base/base.gyp:base', 2369 '../base/base.gyp:base',
2361 '../base/base.gyp:test_support_base', 2370 '../base/base.gyp:test_support_base',
2362 '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util', 2371 '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
2363 '../testing/gtest.gyp:gtest', 2372 '../testing/gtest.gyp:gtest',
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
3136 'net_unittests.isolate', 3145 'net_unittests.isolate',
3137 ], 3146 ],
3138 'sources': [ 3147 'sources': [
3139 'net_unittests.isolate', 3148 'net_unittests.isolate',
3140 ], 3149 ],
3141 }, 3150 },
3142 ], 3151 ],
3143 }], 3152 }],
3144 ], 3153 ],
3145 } 3154 }
OLDNEW
« no previous file with comments | « chrome/tools/build/win/TESTS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698