summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authormallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-26 12:17:31 +0000
committermallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-26 12:17:31 +0000
commitcb1ae8c01b01b889ddefd01c16210944b2030450 (patch)
tree51fc9e3d58888217efd6a705c01271eef058d17b /third_party
parentf66774e21aef2f8fc66fdb422cfd869cb67517b3 (diff)
downloadchromium_src-cb1ae8c01b01b889ddefd01c16210944b2030450.zip
chromium_src-cb1ae8c01b01b889ddefd01c16210944b2030450.tar.gz
chromium_src-cb1ae8c01b01b889ddefd01c16210944b2030450.tar.bz2
Updating chrome to libjingle r175
Review URL: https://chromiumcodereview.appspot.com/10882037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libjingle/README.chromium2
-rw-r--r--third_party/libjingle/libjingle.gyp8
2 files changed, 7 insertions, 3 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index e05c665..5950024 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: 170
+Revision: 174
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 2dcfb8e..ff1a770 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -399,8 +399,12 @@
'sources': [
'source/talk/base/macconversion.cc',
'source/talk/base/macconversion.h',
+ 'source/talk/base/maccocoathreadhelper.h',
+ 'source/talk/base/maccocoathreadhelper.mm',
'source/talk/base/macutils.cc',
'source/talk/base/macutils.h',
+ 'source/talk/base/scoped_autorelease_pool.h',
+ 'source/talk/base/scoped_autorelease_pool.mm',
],
}],
['OS=="android"', {
@@ -545,13 +549,13 @@
'source/talk/media/base/constants.cc',
'source/talk/media/base/constants.h',
'source/talk/media/base/cryptoparams.h',
- 'source/talk/media/base/dataengine.cc',
- 'source/talk/media/base/dataengine.h',
'source/talk/media/base/filemediaengine.cc',
'source/talk/media/base/filemediaengine.h',
'source/talk/media/base/mediachannel.h',
'source/talk/media/base/mediaengine.cc',
'source/talk/media/base/mediaengine.h',
+ 'source/talk/media/base/rtpdataengine.cc',
+ 'source/talk/media/base/rtpdataengine.h',
'source/talk/media/base/rtpdump.cc',
'source/talk/media/base/rtpdump.h',
'source/talk/media/base/rtputils.cc',