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

Side by Side Diff: net/net.gyp

Issue 10882010: Add iOS support to ProxyService (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added related files from chrome/browser/net Created 8 years, 4 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'conditions': [ 10 'conditions': [
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 'proxy/polling_proxy_config_service.h', 560 'proxy/polling_proxy_config_service.h',
561 'proxy/proxy_bypass_rules.cc', 561 'proxy/proxy_bypass_rules.cc',
562 'proxy/proxy_bypass_rules.h', 562 'proxy/proxy_bypass_rules.h',
563 'proxy/proxy_config.cc', 563 'proxy/proxy_config.cc',
564 'proxy/proxy_config.h', 564 'proxy/proxy_config.h',
565 'proxy/proxy_config_service.h', 565 'proxy/proxy_config_service.h',
566 'proxy/proxy_config_service_android.cc', 566 'proxy/proxy_config_service_android.cc',
567 'proxy/proxy_config_service_android.h', 567 'proxy/proxy_config_service_android.h',
568 'proxy/proxy_config_service_fixed.cc', 568 'proxy/proxy_config_service_fixed.cc',
569 'proxy/proxy_config_service_fixed.h', 569 'proxy/proxy_config_service_fixed.h',
570 'proxy/proxy_config_service_ios.cc',
571 'proxy/proxy_config_service_ios.h',
570 'proxy/proxy_config_service_linux.cc', 572 'proxy/proxy_config_service_linux.cc',
571 'proxy/proxy_config_service_linux.h', 573 'proxy/proxy_config_service_linux.h',
572 'proxy/proxy_config_service_mac.cc', 574 'proxy/proxy_config_service_mac.cc',
573 'proxy/proxy_config_service_mac.h', 575 'proxy/proxy_config_service_mac.h',
574 'proxy/proxy_config_service_win.cc', 576 'proxy/proxy_config_service_win.cc',
575 'proxy/proxy_config_service_win.h', 577 'proxy/proxy_config_service_win.h',
576 'proxy/proxy_config_source.cc', 578 'proxy/proxy_config_source.cc',
577 'proxy/proxy_config_source.h', 579 'proxy/proxy_config_source.h',
578 'proxy/proxy_info.cc', 580 'proxy/proxy_info.cc',
579 'proxy/proxy_info.h', 581 'proxy/proxy_info.h',
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
1066 ['include', '^base/net_module\\.'], 1068 ['include', '^base/net_module\\.'],
1067 ['include', '^base/net_util\\.'], 1069 ['include', '^base/net_util\\.'],
1068 ['include', '^base/net_util_posix\\.cc$'], 1070 ['include', '^base/net_util_posix\\.cc$'],
1069 ['include', '^base/platform_mime_util\\.h$'], 1071 ['include', '^base/platform_mime_util\\.h$'],
1070 ['include', '^base/registry_controlled_domains/registry_controlled _domain\\.'], 1072 ['include', '^base/registry_controlled_domains/registry_controlled _domain\\.'],
1071 ['include', '^http/http_byte_range\\.'], 1073 ['include', '^http/http_byte_range\\.'],
1072 ['include', '^http/http_content_disposition\\.'], 1074 ['include', '^http/http_content_disposition\\.'],
1073 ['include', '^http/http_util\\.'], 1075 ['include', '^http/http_util\\.'],
1074 ['include', '^http/http_util_icu\\.cc$'], 1076 ['include', '^http/http_util_icu\\.cc$'],
1075 ['include', '^http/http_version\\.h$'], 1077 ['include', '^http/http_version\\.h$'],
1078 ['include', '^proxy/polling_proxy_config_service\\.'],
1079 ['include', '^proxy/proxy_config\\.'],
1080 ['include', '^proxy/proxy_config_service_ios\\.'],
1081 ['include', '^proxy/proxy_service\\.'],
1076 ], 1082 ],
1077 }, 1083 },
1078 ], 1084 ],
1079 [ 'OS == "android"', { 1085 [ 'OS == "android"', {
1080 'dependencies': [ 1086 'dependencies': [
1081 '../third_party/openssl/openssl.gyp:openssl', 1087 '../third_party/openssl/openssl.gyp:openssl',
1082 'net_jni_headers', 1088 'net_jni_headers',
1083 ], 1089 ],
1084 'sources!': [ 1090 'sources!': [
1085 'base/dnssec_chain_verifier.cc', 1091 'base/dnssec_chain_verifier.cc',
(...skipping 22 matching lines...) Expand all
1108 ['OS == "android"', { 1114 ['OS == "android"', {
1109 'sources/': [ 1115 'sources/': [
1110 ['include', '^base/platform_mime_util_linux\\.cc$'], 1116 ['include', '^base/platform_mime_util_linux\\.cc$'],
1111 ], 1117 ],
1112 }], 1118 }],
1113 ['OS == "ios"', { 1119 ['OS == "ios"', {
1114 'sources/': [ 1120 'sources/': [
1115 ['include', 'base/network_change_notifier_mac\\.cc$'], 1121 ['include', 'base/network_change_notifier_mac\\.cc$'],
1116 ['include', 'base/network_config_watcher_mac\\.cc$'], 1122 ['include', 'base/network_config_watcher_mac\\.cc$'],
1117 ['include', 'base/platform_mime_util_mac\\.mm$'], 1123 ['include', 'base/platform_mime_util_mac\\.mm$'],
1124 ['include', 'proxy/proxy_resolver_mac\\.cc$'],
1118 ], 1125 ],
1119 }], 1126 }],
1120 ], 1127 ],
1121 }, 1128 },
1122 { 1129 {
1123 'target_name': 'net_unittests', 1130 'target_name': 'net_unittests',
1124 'type': '<(gtest_target_type)', 1131 'type': '<(gtest_target_type)',
1125 'dependencies': [ 1132 'dependencies': [
1126 '../base/base.gyp:base', 1133 '../base/base.gyp:base',
1127 '../base/base.gyp:base_i18n', 1134 '../base/base.gyp:base_i18n',
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 'third_party/nss/ssl.gyp:libssl', 1468 'third_party/nss/ssl.gyp:libssl',
1462 ], 1469 ],
1463 }, 1470 },
1464 ], 1471 ],
1465 ['OS == "ios"', { 1472 ['OS == "ios"', {
1466 # TODO: For now this only tests the subset of code that is enabled in 1473 # TODO: For now this only tests the subset of code that is enabled in
1467 # the net target. 1474 # the net target.
1468 'dependencies': [ 1475 'dependencies': [
1469 '../testing/gtest.gyp:gtest_main', 1476 '../testing/gtest.gyp:gtest_main',
1470 ], 1477 ],
1471 'dependencies!': [
1472 'net_test_support',
1473 ],
1474 'sources/': [ 1478 'sources/': [
1475 ['exclude', '.*'], 1479 ['exclude', '.*'],
1476 ['include', '^base/dns_util_unittest\\.cc$'], 1480 ['include', '^base/dns_util_unittest\\.cc$'],
1477 ['include', '^base/escape_unittest\\.cc$'], 1481 ['include', '^base/escape_unittest\\.cc$'],
1478 ['include', '^base/ip_endpoint_unittest\\.cc$'], 1482 ['include', '^base/ip_endpoint_unittest\\.cc$'],
1479 ['include', '^base/mime_util_unittest\\.cc$'], 1483 ['include', '^base/mime_util_unittest\\.cc$'],
1480 ['include', '^base/net_log_unittest\\.cc$'], 1484 ['include', '^base/net_log_unittest\\.cc$'],
1481 ['include', '^base/registry_controlled_domains/registry_controlled_d omain_unittest\\.cc$'], 1485 ['include', '^base/registry_controlled_domains/registry_controlled_d omain_unittest\\.cc$'],
1482 ['include', '^http/http_byte_range_unittest\\.cc$'], 1486 ['include', '^http/http_byte_range_unittest\\.cc$'],
1483 ['include', '^http/http_content_disposition_unittest\\.cc$'], 1487 ['include', '^http/http_content_disposition_unittest\\.cc$'],
1484 ['include', '^http/http_util_unittest\\.cc$'], 1488 ['include', '^http/http_util_unittest\\.cc$'],
1489 ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'],
1485 ], 1490 ],
1486 }], 1491 }],
1487 [ 'OS == "linux"', { 1492 [ 'OS == "linux"', {
1488 'dependencies': [ 1493 'dependencies': [
1489 '../build/linux/system.gyp:dbus', 1494 '../build/linux/system.gyp:dbus',
1490 '../dbus/dbus.gyp:dbus_test_support', 1495 '../dbus/dbus.gyp:dbus_test_support',
1491 ], 1496 ],
1492 }, 1497 },
1493 ], 1498 ],
1494 [ 'OS == "android"', { 1499 [ 'OS == "android"', {
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 '--result', '<@(_outputs)', 2101 '--result', '<@(_outputs)',
2097 '--isolate', 'net_unittests.isolate', 2102 '--isolate', 'net_unittests.isolate',
2098 ], 2103 ],
2099 }, 2104 },
2100 ], 2105 ],
2101 }, 2106 },
2102 ], 2107 ],
2103 }], 2108 }],
2104 ], 2109 ],
2105 } 2110 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698