diff options
| author | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 03:36:52 +0000 |
|---|---|---|
| committer | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 03:36:52 +0000 |
| commit | 07d5b9217d2cdc2cd00978ce1ed638703f735a7b (patch) | |
| tree | 0a5fc1c5cccf0659d350ae3fe8cdbb1fc27a3620 /third_party | |
| parent | 947f36a7de0b78169ff8e1bb851f528068bb1ecd (diff) | |
| download | chromium_src-07d5b9217d2cdc2cd00978ce1ed638703f735a7b.zip chromium_src-07d5b9217d2cdc2cd00978ce1ed638703f735a7b.tar.gz chromium_src-07d5b9217d2cdc2cd00978ce1ed638703f735a7b.tar.bz2 | |
Revert 185114
DEPS change introduces new static initializers, which is forbidden.
It's causing failures in checks that look at how many static
initializers chrome has.
http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/46069
> Roll libjingle r281:r286
>
> BUG=172316,177139
>
> Review URL: https://codereview.chromium.org/12382004
TBR=hclam@google.com
Review URL: https://codereview.chromium.org/12388009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185129 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 5aa4220..e3f4cc1 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: 286 +Revision: 284 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index a6e52fc..2c7dfaf 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -646,6 +646,8 @@ '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.cc', '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.h', '<(libjingle_source)/talk/app/webrtc/peerconnectioninterface.h', + '<(libjingle_source)/talk/app/webrtc/peerconnectionproxy.cc', + '<(libjingle_source)/talk/app/webrtc/peerconnectionproxy.h', '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.cc', '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.h', '<(libjingle_source)/talk/app/webrtc/statscollector.h', |