summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorronghuawu@google.com <ronghuawu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-30 04:54:23 +0000
committerronghuawu@google.com <ronghuawu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-30 04:54:23 +0000
commitdff7641e14c8a86bc9b3ec82246b9b421599e37b (patch)
treeb98234e3fa9b985bca2e8a303585f4426e3ffb0b /third_party
parentd3d15bfacd20d9e5cd6f23c34ab305029c0d50f6 (diff)
downloadchromium_src-dff7641e14c8a86bc9b3ec82246b9b421599e37b.zip
chromium_src-dff7641e14c8a86bc9b3ec82246b9b421599e37b.tar.gz
chromium_src-dff7641e14c8a86bc9b3ec82246b9b421599e37b.tar.bz2
Update libjingle 270:273.
TEST=bots and apprtc Review URL: https://codereview.chromium.org/12092054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179525 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.gyp6
2 files changed, 7 insertions, 1 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index ab8bb021..106e53c 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
Name: libjingle
URL: http://code.google.com/p/libjingle/
Version: unknown
-Revision: 270
+Revision: 273
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 204f3ed..c32500d 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -465,6 +465,10 @@
],
}],
['OS=="android"', {
+ 'sources': [
+ '<(libjingle_source)/talk/base/ifaddrs-android.cc',
+ '<(libjingle_source)/talk/base/ifaddrs-android.h',
+ ],
'sources!': [
# These depend on jsoncpp which we don't load because we probably
# don't actually need this code at all.
@@ -608,6 +612,8 @@
'<(libjingle_source)/talk/app/webrtc/jsepicecandidate.h',
'<(libjingle_source)/talk/app/webrtc/jsepsessiondescription.cc',
'<(libjingle_source)/talk/app/webrtc/jsepsessiondescription.h',
+ '<(libjingle_source)/talk/app/webrtc/localaudiosource.cc',
+ '<(libjingle_source)/talk/app/webrtc/localaudiosource.h',
'<(libjingle_source)/talk/app/webrtc/localvideosource.cc',
'<(libjingle_source)/talk/app/webrtc/localvideosource.h',
'<(libjingle_source)/talk/app/webrtc/mediastream.cc',