diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 18:55:30 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 18:55:30 +0000 |
| commit | 774dcda292846ad3c754aae59aee8125d862ba1e (patch) | |
| tree | 9fe4c12aab76815ce749180f87167215e9173809 /third_party | |
| parent | 54e74d6c572f2c872e425a2143b8579e4cb8f66c (diff) | |
| download | chromium_src-774dcda292846ad3c754aae59aee8125d862ba1e.zip chromium_src-774dcda292846ad3c754aae59aee8125d862ba1e.tar.gz chromium_src-774dcda292846ad3c754aae59aee8125d862ba1e.tar.bz2 | |
Roll libjingle 254:257
This roll adds device whitelist in DeviceManage, and
other minor fixes.
Review URL: https://codereview.chromium.org/11734027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 7dc6a47..074a8d7 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: 251 +Revision: 257 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 6a95648..5ded202 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -731,6 +731,7 @@ '<(libjingle_source)/talk/base/win32window.h', '<(libjingle_source)/talk/base/win32windowpicker.cc', '<(libjingle_source)/talk/base/win32windowpicker.h', + '<(libjingle_source)/talk/media/devices/win32deviceinfo.cc', '<(libjingle_source)/talk/media/devices/win32devicemanager.cc', '<(libjingle_source)/talk/media/devices/win32devicemanager.h', ], @@ -760,6 +761,7 @@ }], ['OS=="mac"', { 'sources': [ + '<(libjingle_source)/talk/media/devices/macdeviceinfo.cc', '<(libjingle_source)/talk/media/devices/macdevicemanager.cc', '<(libjingle_source)/talk/media/devices/macdevicemanager.h', '<(libjingle_source)/talk/media/devices/macdevicemanagermm.mm', |