third_party/libjingle/libjingle_common.gypi - Issue 1323243006: Roll WebRTC 10010:10022, Libjingle 10011:10022

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/libjingle/libjingle_common.gypi

Issue 1323243006: Roll WebRTC 10010:10022, Libjingle 10011:10022 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed DEPS that were being unintentionally modified by git merge Created 5 years, 3 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:

Index: third_party/libjingle/libjingle_common.gypi

diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi

index 26b0ad588028d144db5f9ab36040e7e8d3e6a715..951921f24649ae4ed10ca2927363537b86f9b36e 100644

--- a/third_party/libjingle/libjingle_common.gypi

+++ b/third_party/libjingle/libjingle_common.gypi

@@ -54,8 +54,8 @@

'<(webrtc_p2p)/base/transportchannel.cc',

'<(webrtc_p2p)/base/transportchannel.h',

'<(webrtc_p2p)/base/transportchannelimpl.h',

- '<(webrtc_p2p)/base/transportchannelproxy.cc',

- '<(webrtc_p2p)/base/transportchannelproxy.h',

+ '<(webrtc_p2p)/base/transportcontroller.cc',

+ '<(webrtc_p2p)/base/transportcontroller.h',

'<(webrtc_p2p)/base/transportdescription.cc',

'<(webrtc_p2p)/base/transportdescription.h',

'<(webrtc_p2p)/base/transportdescriptionfactory.cc',

« no previous file with comments | « third_party/libjingle/README.chromium ('k') | no next file » | no next file with comments »