From f5847d7746df8b640b65a8e47849030adb7a3af2 Mon Sep 17 00:00:00 2001 From: "pthatcher@webrtc.org" Date: Thu, 18 Dec 2014 17:09:11 +0000 Subject: [PATCH] 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 --- talk/libjingle.gyp | 6 --- webrtc/libjingle/libjingle.gyp | 39 +++++++++++++++++++ .../session/tunnel/pseudotcpchannel.cc | 0 .../session/tunnel/pseudotcpchannel.h | 0 .../tunnel/securetunnelsessionclient.cc | 4 +- .../tunnel/securetunnelsessionclient.h | 2 +- .../session/tunnel/tunnelsessionclient.cc | 0 .../session/tunnel/tunnelsessionclient.h | 0 .../tunnel/tunnelsessionclient_unittest.cc | 2 +- 9 files changed, 43 insertions(+), 10 deletions(-) rename {talk => webrtc/libjingle}/session/tunnel/pseudotcpchannel.cc (100%) rename {talk => webrtc/libjingle}/session/tunnel/pseudotcpchannel.h (100%) rename {talk => webrtc/libjingle}/session/tunnel/securetunnelsessionclient.cc (99%) rename {talk => webrtc/libjingle}/session/tunnel/securetunnelsessionclient.h (99%) rename {talk => webrtc/libjingle}/session/tunnel/tunnelsessionclient.cc (100%) rename {talk => webrtc/libjingle}/session/tunnel/tunnelsessionclient.h (100%) rename {talk => webrtc/libjingle}/session/tunnel/tunnelsessionclient_unittest.cc (99%) diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 49c8d79ad7..7f1746d407 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -585,12 +585,6 @@ ], }, '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.h', 'session/media/bundlefilter.cc', diff --git a/webrtc/libjingle/libjingle.gyp b/webrtc/libjingle/libjingle.gyp index 42b9992920..ab25bc5874 100644 --- a/webrtc/libjingle/libjingle.gyp +++ b/webrtc/libjingle/libjingle.gyp @@ -25,6 +25,45 @@ 'xmpp/jingleinfotask.h', ], }, # 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', 'type': 'executable', diff --git a/talk/session/tunnel/pseudotcpchannel.cc b/webrtc/libjingle/session/tunnel/pseudotcpchannel.cc similarity index 100% rename from talk/session/tunnel/pseudotcpchannel.cc rename to webrtc/libjingle/session/tunnel/pseudotcpchannel.cc diff --git a/talk/session/tunnel/pseudotcpchannel.h b/webrtc/libjingle/session/tunnel/pseudotcpchannel.h similarity index 100% rename from talk/session/tunnel/pseudotcpchannel.h rename to webrtc/libjingle/session/tunnel/pseudotcpchannel.h diff --git a/talk/session/tunnel/securetunnelsessionclient.cc b/webrtc/libjingle/session/tunnel/securetunnelsessionclient.cc similarity index 99% rename from talk/session/tunnel/securetunnelsessionclient.cc rename to webrtc/libjingle/session/tunnel/securetunnelsessionclient.cc index 4ed8185647..5f6f9dfdf9 100644 --- a/talk/session/tunnel/securetunnelsessionclient.cc +++ b/webrtc/libjingle/session/tunnel/securetunnelsessionclient.cc @@ -28,8 +28,8 @@ // SecureTunnelSessionClient and SecureTunnelSession implementation. #include "webrtc/p2p/base/transportchannel.h" -#include "talk/session/tunnel/pseudotcpchannel.h" -#include "talk/session/tunnel/securetunnelsessionclient.h" +#include "webrtc/libjingle/session/tunnel/pseudotcpchannel.h" +#include "webrtc/libjingle/session/tunnel/securetunnelsessionclient.h" #include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/base/basicdefs.h" #include "webrtc/base/basictypes.h" diff --git a/talk/session/tunnel/securetunnelsessionclient.h b/webrtc/libjingle/session/tunnel/securetunnelsessionclient.h similarity index 99% rename from talk/session/tunnel/securetunnelsessionclient.h rename to webrtc/libjingle/session/tunnel/securetunnelsessionclient.h index 15202a1bf7..98127f3937 100644 --- a/talk/session/tunnel/securetunnelsessionclient.h +++ b/webrtc/libjingle/session/tunnel/securetunnelsessionclient.h @@ -36,7 +36,7 @@ #include -#include "talk/session/tunnel/tunnelsessionclient.h" +#include "webrtc/libjingle/session/tunnel/tunnelsessionclient.h" #include "webrtc/base/sslidentity.h" #include "webrtc/base/sslstreamadapter.h" diff --git a/talk/session/tunnel/tunnelsessionclient.cc b/webrtc/libjingle/session/tunnel/tunnelsessionclient.cc similarity index 100% rename from talk/session/tunnel/tunnelsessionclient.cc rename to webrtc/libjingle/session/tunnel/tunnelsessionclient.cc diff --git a/talk/session/tunnel/tunnelsessionclient.h b/webrtc/libjingle/session/tunnel/tunnelsessionclient.h similarity index 100% rename from talk/session/tunnel/tunnelsessionclient.h rename to webrtc/libjingle/session/tunnel/tunnelsessionclient.h diff --git a/talk/session/tunnel/tunnelsessionclient_unittest.cc b/webrtc/libjingle/session/tunnel/tunnelsessionclient_unittest.cc similarity index 99% rename from talk/session/tunnel/tunnelsessionclient_unittest.cc rename to webrtc/libjingle/session/tunnel/tunnelsessionclient_unittest.cc index 6bd746a408..f40da9380d 100644 --- a/talk/session/tunnel/tunnelsessionclient_unittest.cc +++ b/webrtc/libjingle/session/tunnel/tunnelsessionclient_unittest.cc @@ -29,7 +29,7 @@ #include "webrtc/p2p/base/sessionmanager.h" #include "webrtc/p2p/base/transport.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/messagehandler.h" #include "webrtc/base/scoped_ptr.h"