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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 5363b4905a953464df00f890c5be97cbee86e6a4..3f1730a505c1763af54ca8d69fc724d4a6c926e5 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -574,6 +574,8 @@
'proxy/proxy_config_service_android.h',
'proxy/proxy_config_service_fixed.cc',
'proxy/proxy_config_service_fixed.h',
+ 'proxy/proxy_config_service_ios.cc',
+ 'proxy/proxy_config_service_ios.h',
'proxy/proxy_config_service_linux.cc',
'proxy/proxy_config_service_linux.h',
'proxy/proxy_config_service_mac.cc',
@@ -1103,6 +1105,11 @@
['include', '^http/http_util_icu\\.cc$'],
['include', '^http/http_version\\.h$'],
['include', '^url_request/url_request_job_manager\\.'],
+ ['include', '^proxy/dhcp_proxy_script_fetcher\\.'],
+ ['include', '^proxy/polling_proxy_config_service\\.'],
+ ['include', '^proxy/proxy_config\\.'],
+ ['include', '^proxy/proxy_config_service_ios\\.'],
+ ['include', '^proxy/proxy_service\\.'],
],
},
],
@@ -1145,6 +1152,7 @@
['include', 'base/network_change_notifier_mac\\.cc$'],
['include', 'base/network_config_watcher_mac\\.cc$'],
['include', 'base/platform_mime_util_mac\\.mm$'],
+ ['include', 'proxy/proxy_resolver_mac\\.cc$'],
],
}],
],
@@ -1513,9 +1521,6 @@
'dependencies': [
'../testing/gtest.gyp:gtest_main',
],
- 'dependencies!': [
- 'net_test_support',
- ],
'sources/': [
['exclude', '.*'],
['include', '^base/dns_util_unittest\\.cc$'],
@@ -1527,6 +1532,7 @@
['include', '^http/http_byte_range_unittest\\.cc$'],
['include', '^http/http_content_disposition_unittest\\.cc$'],
['include', '^http/http_util_unittest\\.cc$'],
+ ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'],
],
}],
[ 'OS == "linux"', {

Powered by Google App Engine
This is Rietveld 408576698