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

Unified Diff: remoting/remoting.gyp

Issue 3136030: Unforked xmpp ssl adapter code. (Closed)
Patch Set: - Created 10 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
« 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 fb108f681092cf58de7daa246f843566d96ad206..99580a781fe8f90cff8387c76f144220192edd00 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -286,7 +286,7 @@
'target_name': 'chromoting_jingle_glue',
'type': '<(library)',
'dependencies': [
- '../net/net.gyp:net',
+ '../jingle/jingle.gyp:notifier',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libjingle/libjingle.gyp:libjingle_p2p',
],
@@ -295,8 +295,6 @@
'../third_party/libjingle/libjingle.gyp:libjingle_p2p',
],
'sources': [
- 'jingle_glue/gaia_token_pre_xmpp_auth.cc',
- 'jingle_glue/gaia_token_pre_xmpp_auth.h',
'jingle_glue/iq_request.cc',
'jingle_glue/iq_request.h',
'jingle_glue/jingle_channel.cc',
@@ -309,12 +307,6 @@
'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'
« 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