summaryrefslogtreecommitdiffstats
path: root/remoting/remoting.gyp
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 18:54:49 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 18:54:49 +0000
commit3b51bda549c3cb24e896703a6ce69807cf1a2ba2 (patch)
tree350b8c77c7bdb42f861a4630e076e2829fa3ee62 /remoting/remoting.gyp
parentbc5c61c33b88629598b2613a44e2b132ce56754d (diff)
downloadchromium_src-3b51bda549c3cb24e896703a6ce69807cf1a2ba2.zip
chromium_src-3b51bda549c3cb24e896703a6ce69807cf1a2ba2.tar.gz
chromium_src-3b51bda549c3cb24e896703a6ce69807cf1a2ba2.tar.bz2
Unforked xmpp ssl adapter code.
BUG=50254 TEST=unittests Review URL: http://codereview.chromium.org/3136030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
-rw-r--r--remoting/remoting.gyp10
1 files changed, 1 insertions, 9 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 46d2048..6f7dc28 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -287,7 +287,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',
],
@@ -296,8 +296,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',
@@ -310,12 +308,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'