summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 05:16:17 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 05:16:17 +0000
commit06e2bec34c6740eb53f647cf7254fb6ddf0ff274 (patch)
tree48be036d90e66227699fd6c114902c2e708ff434 /third_party
parent2ed5fecb9fad05e7ce26adba374cd95b9b18a0bc (diff)
downloadchromium_src-06e2bec34c6740eb53f647cf7254fb6ddf0ff274.zip
chromium_src-06e2bec34c6740eb53f647cf7254fb6ddf0ff274.tar.gz
chromium_src-06e2bec34c6740eb53f647cf7254fb6ddf0ff274.tar.bz2
Revert 160781 - Update webrtc to 2881 and libjingle to 202.
It broke the "ChromiumOS (daisy)" bot: <http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28daisy%29/builds/3567/steps/BuildTarget/logs/stdio> as listed in the following snippet. chromeos-chrome-24.0.1290.0_alpha-r1: third_party/webrtc/common_audio/signal_processing/spl_init.c:35:13: error: 'InitPointersToC' defined but not used [-Werror=unused-function] chromeos-chrome-24.0.1290.0_alpha-r1: cc1: all warnings being treated as errors chromeos-chrome-24.0.1290.0_alpha-r1: make: *** [c/Release/obj.target/signal_processing/third_party/webrtc/common_audio/signal_processing/spl_init.o] Error 1 chromeos-chrome-24.0.1290.0_alpha-r1: make: *** Waiting for unfinished jobs.... TEST=apprtc.appspot.com and chrome/test/functional/webrtc_call.py Review URL: https://chromiumcodereview.appspot.com/11066063 TBR=ronghuawu@chromium.org Review URL: https://codereview.chromium.org/11098011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160801 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.gyp3
2 files changed, 1 insertions, 4 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index ee0c986..f9c5c40 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: 202
+Revision: 199
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index c4d3e07..ccdc2bd 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -23,9 +23,6 @@
'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': {