summaryrefslogtreecommitdiffstats
path: root/third_party/libjingle
diff options
context:
space:
mode:
authorronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 03:43:03 +0000
committerronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 03:43:03 +0000
commitd61d742a8f0725dcf73465c1dae850af073db071 (patch)
treec588ce00c3b9adbe759d7b5d36e2d9bbbc1c6bef /third_party/libjingle
parent26d095b0c412ee034275ff27eadd7502a644a6b6 (diff)
downloadchromium_src-d61d742a8f0725dcf73465c1dae850af073db071.zip
chromium_src-d61d742a8f0725dcf73465c1dae850af073db071.tar.gz
chromium_src-d61d742a8f0725dcf73465c1dae850af073db071.tar.bz2
Update webrtc to 2881 and libjingle to 202.
TEST=apprtc.appspot.com and chrome/test/functional/webrtc_call.py Review URL: https://chromiumcodereview.appspot.com/11066063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
-rw-r--r--third_party/libjingle/README.chromium2
-rw-r--r--third_party/libjingle/libjingle.gyp3
2 files changed, 4 insertions, 1 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index f9c5c40..ee0c986 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication.
Short Name: libjingle
URL: http://code.google.com/p/libjingle/
Version: unknown
-Revision: 199
+Revision: 202
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index ccdc2bd..c4d3e07 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -23,6 +23,9 @@
'NO_SOUND_SYSTEM',
'SRTP_RELATIVE_PATH',
'_USE_32BIT_TIME_T',
+ # TODO(ronghuawu): Remove this once libjingle is updated to use the new
+ # webrtc.
+ 'USE_WEBRTC_DEV_BRANCH',
],
'configurations': {
'Debug': {