summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 21:59:55 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 21:59:55 +0000
commit3c3065d5e74b5487f94f2f8f17be9169d4f805fc (patch)
tree314c61f8c7d2a6b1464e38455c6b69d807e95ec4 /chrome/chrome_common.gypi
parentdde46b66c618a3ab242ddfbceb0290699a32012c (diff)
downloadchromium_src-3c3065d5e74b5487f94f2f8f17be9169d4f805fc.zip
chromium_src-3c3065d5e74b5487f94f2f8f17be9169d4f805fc.tar.gz
chromium_src-3c3065d5e74b5487f94f2f8f17be9169d4f805fc.tar.bz2
Moved everything in browser/sync/net to common/net.
This is so it can be used by both common/net/notifier and browser/sync. Removed unused and rotted unittest file. BUG=42606 TEST=trybots Review URL: http://codereview.chromium.org/2022001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi32
1 files changed, 25 insertions, 7 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 3d9c4f9..93728d5 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -119,6 +119,7 @@
'chrome_resources',
'chrome_strings',
'common_constants',
+ 'common_net',
'theme_resources',
'../app/app.gyp:app_base',
'../app/app.gyp:app_resources',
@@ -127,7 +128,6 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../ipc/ipc.gyp:ipc',
'../net/net.gyp:net',
- '../net/net.gyp:net_resources',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -172,12 +172,6 @@
'common/extensions/user_script.cc',
'common/extensions/user_script.h',
'common/gfx/utils.h',
- 'common/net/dns.h',
- 'common/net/net_resource_provider.cc',
- 'common/net/net_resource_provider.h',
- 'common/net/socket_stream.h',
- 'common/net/url_request_intercept_job.cc',
- 'common/net/url_request_intercept_job.h',
'common/web_resource/web_resource_unpacker.cc',
'common/web_resource/web_resource_unpacker.h',
'common/appcache/appcache_backend_proxy.cc',
@@ -307,6 +301,30 @@
'../app/app.gyp:app_base',
],
},
+ {
+ 'target_name': 'common_net',
+ 'type': '<(library)',
+ 'sources': [
+ 'common/net/dns.h',
+ 'common/net/net_resource_provider.cc',
+ 'common/net/net_resource_provider.h',
+ 'common/net/network_change_notifier_proxy.cc',
+ 'common/net/network_change_notifier_proxy.h',
+ 'common/net/network_change_notifier_thread.h',
+ 'common/net/network_change_observer_proxy.cc',
+ 'common/net/network_change_observer_proxy.h',
+ 'common/net/socket_stream.h',
+ 'common/net/url_request_intercept_job.cc',
+ 'common/net/url_request_intercept_job.h',
+ ],
+ 'dependencies': [
+ 'chrome_resources',
+ 'chrome_strings',
+ '../base/base.gyp:base',
+ '../net/net.gyp:net_base',
+ '../net/net.gyp:net_resources',
+ ],
+ },
],
'conditions': [
['OS=="win"', {