Move session/tunnel to webrtc/libjingle. This is part of the ongoing effort to move Jingle-specific things out of WebRTC and into its own repository. I won't submit this until all other projects have moved off of compiling this as well.
R=juberti@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/38369004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7953 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
		| @@ -585,12 +585,6 @@ | |||||||
|         ], |         ], | ||||||
|       }, |       }, | ||||||
|       'sources': [ |       'sources': [ | ||||||
|         'session/tunnel/pseudotcpchannel.cc', |  | ||||||
|         'session/tunnel/pseudotcpchannel.h', |  | ||||||
|         'session/tunnel/tunnelsessionclient.cc', |  | ||||||
|         'session/tunnel/tunnelsessionclient.h', |  | ||||||
|         'session/tunnel/securetunnelsessionclient.cc', |  | ||||||
|         'session/tunnel/securetunnelsessionclient.h', |  | ||||||
|         'session/media/audiomonitor.cc', |         'session/media/audiomonitor.cc', | ||||||
|         'session/media/audiomonitor.h', |         'session/media/audiomonitor.h', | ||||||
|         'session/media/bundlefilter.cc', |         'session/media/bundlefilter.cc', | ||||||
|   | |||||||
| @@ -25,6 +25,45 @@ | |||||||
|         'xmpp/jingleinfotask.h', |         'xmpp/jingleinfotask.h', | ||||||
|       ], |       ], | ||||||
|     },  # target libjingle_xmpphelp |     },  # target libjingle_xmpphelp | ||||||
|  |     { | ||||||
|  |       'target_name': 'jingle_session', | ||||||
|  |       'type': 'static_library', | ||||||
|  |       'dependencies': [ | ||||||
|  |         '<(webrtc_root)/base/base.gyp:webrtc_base', | ||||||
|  |         '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp', | ||||||
|  |         '<(DEPTH)/third_party/expat/expat.gyp:expat', | ||||||
|  |       ], | ||||||
|  |       'cflags_cc!': [ | ||||||
|  |         '-Wnon-virtual-dtor', | ||||||
|  |       ], | ||||||
|  |       'export_dependent_settings': [ | ||||||
|  |         '<(DEPTH)/third_party/expat/expat.gyp:expat', | ||||||
|  |       ], | ||||||
|  |       'sources': [ | ||||||
|  |         'session/tunnel/pseudotcpchannel.cc', | ||||||
|  |         'session/tunnel/pseudotcpchannel.h', | ||||||
|  |         'session/tunnel/tunnelsessionclient.cc', | ||||||
|  |         'session/tunnel/tunnelsessionclient.h', | ||||||
|  |         'session/tunnel/securetunnelsessionclient.cc', | ||||||
|  |         'session/tunnel/securetunnelsessionclient.h', | ||||||
|  |       ], | ||||||
|  |       'direct_dependent_settings': { | ||||||
|  |         'cflags_cc!': [ | ||||||
|  |           '-Wnon-virtual-dtor', | ||||||
|  |         ], | ||||||
|  |         'defines': [ | ||||||
|  |           'FEATURE_ENABLE_VOICEMAIL', | ||||||
|  |         ], | ||||||
|  |       }, | ||||||
|  |       'conditions': [ | ||||||
|  |         ['build_with_chromium==0', { | ||||||
|  |           'defines': [ | ||||||
|  |             'FEATURE_ENABLE_VOICEMAIL', | ||||||
|  |             'FEATURE_ENABLE_PSTN', | ||||||
|  |           ], | ||||||
|  |         }], | ||||||
|  |       ], | ||||||
|  |     }, | ||||||
|     { |     { | ||||||
|       'target_name': 'login', |       'target_name': 'login', | ||||||
|       'type': 'executable', |       'type': 'executable', | ||||||
|   | |||||||
| @@ -28,8 +28,8 @@ | |||||||
| // SecureTunnelSessionClient and SecureTunnelSession implementation.
 | // SecureTunnelSessionClient and SecureTunnelSession implementation.
 | ||||||
| 
 | 
 | ||||||
| #include "webrtc/p2p/base/transportchannel.h" | #include "webrtc/p2p/base/transportchannel.h" | ||||||
| #include "talk/session/tunnel/pseudotcpchannel.h" | #include "webrtc/libjingle/session/tunnel/pseudotcpchannel.h" | ||||||
| #include "talk/session/tunnel/securetunnelsessionclient.h" | #include "webrtc/libjingle/session/tunnel/securetunnelsessionclient.h" | ||||||
| #include "webrtc/libjingle/xmllite/xmlelement.h" | #include "webrtc/libjingle/xmllite/xmlelement.h" | ||||||
| #include "webrtc/base/basicdefs.h" | #include "webrtc/base/basicdefs.h" | ||||||
| #include "webrtc/base/basictypes.h" | #include "webrtc/base/basictypes.h" | ||||||
| @@ -36,7 +36,7 @@ | |||||||
| 
 | 
 | ||||||
| #include <string> | #include <string> | ||||||
| 
 | 
 | ||||||
| #include "talk/session/tunnel/tunnelsessionclient.h" | #include "webrtc/libjingle/session/tunnel/tunnelsessionclient.h" | ||||||
| #include "webrtc/base/sslidentity.h" | #include "webrtc/base/sslidentity.h" | ||||||
| #include "webrtc/base/sslstreamadapter.h" | #include "webrtc/base/sslstreamadapter.h" | ||||||
| 
 | 
 | ||||||
| @@ -29,7 +29,7 @@ | |||||||
| #include "webrtc/p2p/base/sessionmanager.h" | #include "webrtc/p2p/base/sessionmanager.h" | ||||||
| #include "webrtc/p2p/base/transport.h" | #include "webrtc/p2p/base/transport.h" | ||||||
| #include "webrtc/p2p/client/fakeportallocator.h" | #include "webrtc/p2p/client/fakeportallocator.h" | ||||||
| #include "talk/session/tunnel/tunnelsessionclient.h" | #include "webrtc/libjingle/session/tunnel/tunnelsessionclient.h" | ||||||
| #include "webrtc/base/gunit.h" | #include "webrtc/base/gunit.h" | ||||||
| #include "webrtc/base/messagehandler.h" | #include "webrtc/base/messagehandler.h" | ||||||
| #include "webrtc/base/scoped_ptr.h" | #include "webrtc/base/scoped_ptr.h" | ||||||
		Reference in New Issue
	
	Block a user
	 pthatcher@webrtc.org
					pthatcher@webrtc.org