diff options
author | henrike@webrtc.org <henrike@webrtc.org> | 2014-10-28 22:20:11 +0000 |
---|---|---|
committer | henrike@webrtc.org <henrike@webrtc.org> | 2014-10-28 22:20:11 +0000 |
commit | 1a02faa335e7d8076b5cf8dd9a584e72669b0c8e (patch) | |
tree | c571494805a1d55b5baf0312509967732f804d39 /webrtc_tests.gypi | |
parent | b136cd238df9dc364ad1c70be73316ddddf95b64 (diff) | |
download | webrtc-1a02faa335e7d8076b5cf8dd9a584e72669b0c8e.tar.gz |
move xmpp and p2p to webrtc
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and
webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder.
BUG=3379
Review URL: https://webrtc-codereview.appspot.com/26999004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7549 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc_tests.gypi')
-rw-r--r-- | webrtc_tests.gypi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index 847feffd..33e50e70 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -15,8 +15,12 @@ 'base/base_tests.gyp:rtc_base_tests_utils', 'base/base_tests.gyp:rtc_base_tests', 'libjingle/xmllite/xmllite.gyp:rtc_xmllite', + 'libjingle/xmpp/xmpp.gyp:rtc_xmpp', + 'p2p/p2p.gyp:rtc_p2p', + 'rtc_p2p_unittest', 'rtc_sound_tests', 'rtc_xmllite_unittest', + 'rtc_xmpp_unittest', 'sound/sound.gyp:rtc_sound', '<(DEPTH)/testing/gtest.gyp:gtest', ], |