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

Side by Side Diff: net/net.gyp

Issue 60009: ProxyConfigService for Linux.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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/app/chrome_dll_main.cc ('k') | net/proxy/proxy_config.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 'http/http_util.cc', 231 'http/http_util.cc',
232 'http/http_util.h', 232 'http/http_util.h',
233 'http/http_vary_data.cc', 233 'http/http_vary_data.cc',
234 'http/http_vary_data.h', 234 'http/http_vary_data.h',
235 'http/md4.cc', 235 'http/md4.cc',
236 'http/md4.h', 236 'http/md4.h',
237 'proxy/proxy_config.cc', 237 'proxy/proxy_config.cc',
238 'proxy/proxy_config.h', 238 'proxy/proxy_config.h',
239 'proxy/proxy_config_service.h', 239 'proxy/proxy_config_service.h',
240 'proxy/proxy_config_service_fixed.h', 240 'proxy/proxy_config_service_fixed.h',
241 'proxy/proxy_config_service_linux.cc',
242 'proxy/proxy_config_service_linux.h',
241 'proxy/proxy_config_service_win.cc', 243 'proxy/proxy_config_service_win.cc',
242 'proxy/proxy_config_service_win.h', 244 'proxy/proxy_config_service_win.h',
243 'proxy/proxy_info.cc', 245 'proxy/proxy_info.cc',
244 'proxy/proxy_info.h', 246 'proxy/proxy_info.h',
245 'proxy/proxy_list.cc', 247 'proxy/proxy_list.cc',
246 'proxy/proxy_list.h', 248 'proxy/proxy_list.h',
247 'proxy/proxy_resolver.h', 249 'proxy/proxy_resolver.h',
248 'proxy/proxy_resolver_mac.cc', 250 'proxy/proxy_resolver_mac.cc',
249 'proxy/proxy_resolver_script.h', 251 'proxy/proxy_resolver_script.h',
250 'proxy/proxy_resolver_v8.cc', 252 'proxy/proxy_resolver_v8.cc',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 'sources!': [ 302 'sources!': [
301 'build/precompiled_net.h', 303 'build/precompiled_net.h',
302 'build/precompiled_net.cc', 304 'build/precompiled_net.cc',
303 ], 305 ],
304 'export_dependent_settings': [ 306 'export_dependent_settings': [
305 '../base/base.gyp:base', 307 '../base/base.gyp:base',
306 ], 308 ],
307 'conditions': [ 309 'conditions': [
308 [ 'OS == "linux"', { 310 [ 'OS == "linux"', {
309 'dependencies': [ 311 'dependencies': [
312 '../build/linux/system.gyp:gconf',
313 '../build/linux/system.gyp:gdk',
310 '../build/linux/system.gyp:nss', 314 '../build/linux/system.gyp:nss',
311 ], 315 ],
312 }], 316 }],
313 [ 'OS == "win"', { 317 [ 'OS == "win"', {
314 'sources/': [ ['exclude', '_(mac|linux|posix)\\.cc$'] ], 318 'sources/': [ ['exclude', '_(mac|linux|posix)\\.cc$'] ],
315 'sources!': [ 319 'sources!': [
316 'base/tcp_client_socket_libevent.cc', 320 'base/tcp_client_socket_libevent.cc',
317 ], 321 ],
318 'dependencies': [ 322 'dependencies': [
319 'tld_cleanup', 323 'tld_cleanup',
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 'http/http_auth_unittest.cc', 424 'http/http_auth_unittest.cc',
421 'http/http_cache_unittest.cc', 425 'http/http_cache_unittest.cc',
422 'http/http_chunked_decoder_unittest.cc', 426 'http/http_chunked_decoder_unittest.cc',
423 'http/http_network_layer_unittest.cc', 427 'http/http_network_layer_unittest.cc',
424 'http/http_network_transaction_unittest.cc', 428 'http/http_network_transaction_unittest.cc',
425 'http/http_response_headers_unittest.cc', 429 'http/http_response_headers_unittest.cc',
426 'http/http_transaction_unittest.cc', 430 'http/http_transaction_unittest.cc',
427 'http/http_transaction_unittest.h', 431 'http/http_transaction_unittest.h',
428 'http/http_util_unittest.cc', 432 'http/http_util_unittest.cc',
429 'http/http_vary_data_unittest.cc', 433 'http/http_vary_data_unittest.cc',
434 'proxy/proxy_config_service_common_unittest.cc',
435 'proxy/proxy_config_service_common_unittest.h',
436 'proxy/proxy_config_service_linux_unittest.cc',
430 'proxy/proxy_config_service_win_unittest.cc', 437 'proxy/proxy_config_service_win_unittest.cc',
431 'proxy/proxy_config_unittest.cc', 438 'proxy/proxy_config_unittest.cc',
432 'proxy/proxy_list_unittest.cc', 439 'proxy/proxy_list_unittest.cc',
433 'proxy/proxy_resolver_v8_unittest.cc', 440 'proxy/proxy_resolver_v8_unittest.cc',
434 'proxy/proxy_script_fetcher_unittest.cc', 441 'proxy/proxy_script_fetcher_unittest.cc',
435 'proxy/proxy_server_unittest.cc', 442 'proxy/proxy_server_unittest.cc',
436 'proxy/proxy_service_unittest.cc', 443 'proxy/proxy_service_unittest.cc',
437 'url_request/url_request_unittest.cc', 444 'url_request/url_request_unittest.cc',
438 'url_request/url_request_unittest.h', 445 'url_request/url_request_unittest.h',
439 ], 446 ],
440 'conditions': [ 447 'conditions': [
448 [ 'OS == "win"', {
449 'sources/': [ ['exclude', '_(mac|linux|posix)_unittest\\.cc$'] ],
450 },
451 ],
441 [ 'OS != "win"', { 452 [ 'OS != "win"', {
442 'sources!': [ 453 'sources!': [
443 'base/wininet_util_unittest.cc', 454 'base/wininet_util_unittest.cc',
444 'proxy/proxy_config_service_win_unittest.cc',
445 ], 455 ],
446 }, 456 },
447 ], 457 ],
448 [ 'OS == "linux"', { 458 [ 'OS == "linux"', {
459 'sources/': [ ['exclude', '_(mac|win)_unittest\\.cc$'] ],
449 'dependencies': [ 460 'dependencies': [
450 '../build/linux/system.gyp:gtk', 461 '../build/linux/system.gyp:gtk',
451 ], 462 ],
452 'sources!': [ 463 'sources!': [
453 'base/sdch_filter_unittest.cc', 464 'base/sdch_filter_unittest.cc',
454 'base/ssl_config_service_unittest.cc', 465 'base/ssl_config_service_unittest.cc',
455 ], 466 ],
456 }, 467 },
457 ], 468 ],
458 [ 'OS == "mac"', { 469 [ 'OS == "mac"', {
470 'sources/': [ ['exclude', '_(linux|win)_unittest\\.cc$'] ],
459 'sources!': [ 471 'sources!': [
460 'base/ssl_config_service_unittest.cc', 472 'base/ssl_config_service_unittest.cc',
461 ], 473 ],
462 }, 474 },
463 ], 475 ],
464 # This is needed to trigger the dll copy step on windows. 476 # This is needed to trigger the dll copy step on windows.
465 # TODO(mark): Specifying this here shouldn't be necessary. 477 # TODO(mark): Specifying this here shouldn't be necessary.
466 [ 'OS == "win"', { 478 [ 'OS == "win"', {
467 'dependencies': [ 479 'dependencies': [
468 '../third_party/icu38/icu38.gyp:icudata', 480 '../third_party/icu38/icu38.gyp:icudata',
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 'sources': [ 604 'sources': [
593 'tools/dump_cache/dump_cache.cc', 605 'tools/dump_cache/dump_cache.cc',
594 'tools/dump_cache/dump_files.cc', 606 'tools/dump_cache/dump_files.cc',
595 'tools/dump_cache/upgrade.cc', 607 'tools/dump_cache/upgrade.cc',
596 ], 608 ],
597 }, 609 },
598 ], 610 ],
599 }], 611 }],
600 ], 612 ],
601 } 613 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | net/proxy/proxy_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698