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

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: Applied wtc's comments Created 8 years, 3 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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 'proxy/polling_proxy_config_service.h', 567 'proxy/polling_proxy_config_service.h',
568 'proxy/proxy_bypass_rules.cc', 568 'proxy/proxy_bypass_rules.cc',
569 'proxy/proxy_bypass_rules.h', 569 'proxy/proxy_bypass_rules.h',
570 'proxy/proxy_config.cc', 570 'proxy/proxy_config.cc',
571 'proxy/proxy_config.h', 571 'proxy/proxy_config.h',
572 'proxy/proxy_config_service.h', 572 'proxy/proxy_config_service.h',
573 'proxy/proxy_config_service_android.cc', 573 'proxy/proxy_config_service_android.cc',
574 'proxy/proxy_config_service_android.h', 574 'proxy/proxy_config_service_android.h',
575 'proxy/proxy_config_service_fixed.cc', 575 'proxy/proxy_config_service_fixed.cc',
576 'proxy/proxy_config_service_fixed.h', 576 'proxy/proxy_config_service_fixed.h',
577 'proxy/proxy_config_service_ios.cc',
578 'proxy/proxy_config_service_ios.h',
577 'proxy/proxy_config_service_linux.cc', 579 'proxy/proxy_config_service_linux.cc',
578 'proxy/proxy_config_service_linux.h', 580 'proxy/proxy_config_service_linux.h',
579 'proxy/proxy_config_service_mac.cc', 581 'proxy/proxy_config_service_mac.cc',
580 'proxy/proxy_config_service_mac.h', 582 'proxy/proxy_config_service_mac.h',
581 'proxy/proxy_config_service_win.cc', 583 'proxy/proxy_config_service_win.cc',
582 'proxy/proxy_config_service_win.h', 584 'proxy/proxy_config_service_win.h',
583 'proxy/proxy_config_source.cc', 585 'proxy/proxy_config_source.cc',
584 'proxy/proxy_config_source.h', 586 'proxy/proxy_config_source.h',
585 'proxy/proxy_info.cc', 587 'proxy/proxy_info.cc',
586 'proxy/proxy_info.h', 588 'proxy/proxy_info.h',
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 ['include', '^base/net_util\\.'], 1098 ['include', '^base/net_util\\.'],
1097 ['include', '^base/net_util_posix\\.cc$'], 1099 ['include', '^base/net_util_posix\\.cc$'],
1098 ['include', '^base/platform_mime_util\\.h$'], 1100 ['include', '^base/platform_mime_util\\.h$'],
1099 ['include', '^base/registry_controlled_domains/registry_controlled _domain\\.'], 1101 ['include', '^base/registry_controlled_domains/registry_controlled _domain\\.'],
1100 ['include', '^http/http_byte_range\\.'], 1102 ['include', '^http/http_byte_range\\.'],
1101 ['include', '^http/http_content_disposition\\.'], 1103 ['include', '^http/http_content_disposition\\.'],
1102 ['include', '^http/http_util\\.'], 1104 ['include', '^http/http_util\\.'],
1103 ['include', '^http/http_util_icu\\.cc$'], 1105 ['include', '^http/http_util_icu\\.cc$'],
1104 ['include', '^http/http_version\\.h$'], 1106 ['include', '^http/http_version\\.h$'],
1105 ['include', '^url_request/url_request_job_manager\\.'], 1107 ['include', '^url_request/url_request_job_manager\\.'],
1108 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'],
1109 ['include', '^proxy/polling_proxy_config_service\\.'],
1110 ['include', '^proxy/proxy_config\\.'],
1111 ['include', '^proxy/proxy_config_service_ios\\.'],
1112 ['include', '^proxy/proxy_service\\.'],
1106 ], 1113 ],
1107 }, 1114 },
1108 ], 1115 ],
1109 [ 'OS == "android"', { 1116 [ 'OS == "android"', {
1110 'dependencies': [ 1117 'dependencies': [
1111 '../third_party/openssl/openssl.gyp:openssl', 1118 '../third_party/openssl/openssl.gyp:openssl',
1112 'net_jni_headers', 1119 'net_jni_headers',
1113 ], 1120 ],
1114 'sources!': [ 1121 'sources!': [
1115 'base/dnssec_chain_verifier.cc', 1122 'base/dnssec_chain_verifier.cc',
(...skipping 22 matching lines...) Expand all
1138 ['OS == "android"', { 1145 ['OS == "android"', {
1139 'sources/': [ 1146 'sources/': [
1140 ['include', '^base/platform_mime_util_linux\\.cc$'], 1147 ['include', '^base/platform_mime_util_linux\\.cc$'],
1141 ], 1148 ],
1142 }], 1149 }],
1143 ['OS == "ios"', { 1150 ['OS == "ios"', {
1144 'sources/': [ 1151 'sources/': [
1145 ['include', 'base/network_change_notifier_mac\\.cc$'], 1152 ['include', 'base/network_change_notifier_mac\\.cc$'],
1146 ['include', 'base/network_config_watcher_mac\\.cc$'], 1153 ['include', 'base/network_config_watcher_mac\\.cc$'],
1147 ['include', 'base/platform_mime_util_mac\\.mm$'], 1154 ['include', 'base/platform_mime_util_mac\\.mm$'],
1155 ['include', 'proxy/proxy_resolver_mac\\.cc$'],
1148 ], 1156 ],
1149 }], 1157 }],
1150 ], 1158 ],
1151 }, 1159 },
1152 { 1160 {
1153 'target_name': 'net_unittests', 1161 'target_name': 'net_unittests',
1154 'type': '<(gtest_target_type)', 1162 'type': '<(gtest_target_type)',
1155 'dependencies': [ 1163 'dependencies': [
1156 '../base/base.gyp:base', 1164 '../base/base.gyp:base',
1157 '../base/base.gyp:base_i18n', 1165 '../base/base.gyp:base_i18n',
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 'third_party/nss/ssl.gyp:libssl', 1514 'third_party/nss/ssl.gyp:libssl',
1507 ], 1515 ],
1508 }, 1516 },
1509 ], 1517 ],
1510 ['OS == "ios"', { 1518 ['OS == "ios"', {
1511 # TODO: For now this only tests the subset of code that is enabled in 1519 # TODO: For now this only tests the subset of code that is enabled in
1512 # the net target. 1520 # the net target.
1513 'dependencies': [ 1521 'dependencies': [
1514 '../testing/gtest.gyp:gtest_main', 1522 '../testing/gtest.gyp:gtest_main',
1515 ], 1523 ],
1516 'dependencies!': [
1517 'net_test_support',
1518 ],
1519 'sources/': [ 1524 'sources/': [
1520 ['exclude', '.*'], 1525 ['exclude', '.*'],
1521 ['include', '^base/dns_util_unittest\\.cc$'], 1526 ['include', '^base/dns_util_unittest\\.cc$'],
1522 ['include', '^base/escape_unittest\\.cc$'], 1527 ['include', '^base/escape_unittest\\.cc$'],
1523 ['include', '^base/ip_endpoint_unittest\\.cc$'], 1528 ['include', '^base/ip_endpoint_unittest\\.cc$'],
1524 ['include', '^base/mime_util_unittest\\.cc$'], 1529 ['include', '^base/mime_util_unittest\\.cc$'],
1525 ['include', '^base/net_log_unittest\\.cc$'], 1530 ['include', '^base/net_log_unittest\\.cc$'],
1526 ['include', '^base/registry_controlled_domains/registry_controlled_d omain_unittest\\.cc$'], 1531 ['include', '^base/registry_controlled_domains/registry_controlled_d omain_unittest\\.cc$'],
1527 ['include', '^http/http_byte_range_unittest\\.cc$'], 1532 ['include', '^http/http_byte_range_unittest\\.cc$'],
1528 ['include', '^http/http_content_disposition_unittest\\.cc$'], 1533 ['include', '^http/http_content_disposition_unittest\\.cc$'],
1529 ['include', '^http/http_util_unittest\\.cc$'], 1534 ['include', '^http/http_util_unittest\\.cc$'],
1535 ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'],
1530 ], 1536 ],
1531 }], 1537 }],
1532 [ 'OS == "linux"', { 1538 [ 'OS == "linux"', {
1533 'dependencies': [ 1539 'dependencies': [
1534 '../build/linux/system.gyp:dbus', 1540 '../build/linux/system.gyp:dbus',
1535 '../dbus/dbus.gyp:dbus_test_support', 1541 '../dbus/dbus.gyp:dbus_test_support',
1536 ], 1542 ],
1537 }, 1543 },
1538 ], 1544 ],
1539 [ 'OS == "android"', { 1545 [ 'OS == "android"', {
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
2141 '--result', '<@(_outputs)', 2147 '--result', '<@(_outputs)',
2142 '--isolate', 'net_unittests.isolate', 2148 '--isolate', 'net_unittests.isolate',
2143 ], 2149 ],
2144 }, 2150 },
2145 ], 2151 ],
2146 }, 2152 },
2147 ], 2153 ],
2148 }], 2154 }],
2149 ], 2155 ],
2150 } 2156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698