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

Unified Diff: remoting/remoting.gyp

Issue 2843026: Fork a copy of all the notifier code in chrome/common/net/notifier that we depend on. (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: Merge in sergey's patch (2834024) and fix checkdeps Created 10 years, 6 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
« no previous file with comments | « remoting/jingle_glue/xmpp_socket_adapter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 8fdf56c610cc5d8c92597058add9b18af57a4221..f8a2f895a634cdcb6538086ead63e14da72b8901 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -252,9 +252,7 @@
'target_name': 'chromoting_jingle_glue',
'type': '<(library)',
'dependencies': [
- # TODO(sergeyu): move all code that is shared between notifier and
- # jingle_glue to a separate library and use it here.
- '../chrome/chrome.gyp:notifier',
+ '../net/net.gyp:net',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libjingle/libjingle.gyp:libjingle_p2p',
],
@@ -263,18 +261,26 @@
'../third_party/libjingle/libjingle.gyp:libjingle_p2p',
],
'sources': [
- 'jingle_glue/iq_request.h',
+ 'jingle_glue/gaia_token_pre_xmpp_auth.cc',
+ 'jingle_glue/gaia_token_pre_xmpp_auth.h',
'jingle_glue/iq_request.cc',
- 'jingle_glue/jingle_channel.h',
+ 'jingle_glue/iq_request.h',
'jingle_glue/jingle_channel.cc',
- 'jingle_glue/jingle_client.h',
+ 'jingle_glue/jingle_channel.h',
'jingle_glue/jingle_client.cc',
- 'jingle_glue/jingle_info_task.h',
+ 'jingle_glue/jingle_client.h',
'jingle_glue/jingle_info_task.cc',
- 'jingle_glue/jingle_thread.h',
+ 'jingle_glue/jingle_info_task.h',
'jingle_glue/jingle_thread.cc',
- 'jingle_glue/relay_port_allocator.h',
+ 'jingle_glue/jingle_thread.h',
'jingle_glue/relay_port_allocator.cc',
+ 'jingle_glue/relay_port_allocator.h',
+ 'jingle_glue/ssl_adapter.cc',
+ 'jingle_glue/ssl_adapter.h',
+ 'jingle_glue/ssl_socket_adapter.cc',
+ 'jingle_glue/ssl_socket_adapter.h',
+ 'jingle_glue/xmpp_socket_adapter.cc',
+ 'jingle_glue/xmpp_socket_adapter.h',
],
}, # end of target 'chromoting_jingle_glue'
@@ -305,13 +311,6 @@
'../gfx/gfx.gyp:*',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- # TODO(hclam): Remove all these extra dependencies notifier is moved
- # outside of chrome.gyp.
- '../chrome/chrome.gyp:browser',
- '../chrome/chrome.gyp:chrome_version_info',
- '../chrome/chrome.gyp:debugger',
- '../chrome/chrome.gyp:plugin',
- '../chrome/chrome.gyp:renderer',
'../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
'../webkit/support/webkit_support.gyp:appcache',
'../webkit/support/webkit_support.gyp:database',
« no previous file with comments | « remoting/jingle_glue/xmpp_socket_adapter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698