From ac770845831b3e6dd818417f6bef8b03657f7db9 Mon Sep 17 00:00:00 2001
From: "leozwang@webrtc.org"
 <leozwang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 19 Dec 2012 17:24:30 +0000
Subject: [PATCH] Roll opus to 172355 and delete opus_demo from webrtc opus

opus_demo has been inlucded in opus in chromium.

BUG=None
TEST=trybots
Review URL: https://webrtc-codereview.appspot.com/973013

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3317 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 DEPS                                          |  4 +--
 .../audio_coding/codecs/opus/opus.gypi        | 28 -------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/DEPS b/DEPS
index c626553e6f..2479da6d6e 100644
--- a/DEPS
+++ b/DEPS
@@ -58,10 +58,10 @@ deps = {
     (Var("googlecode_url") % "libyuv") + "/trunk@520",
 
   "third_party/opus":
-    Var("chromium_trunk") + "/src/third_party/opus@165570",
+    Var("chromium_trunk") + "/src/third_party/opus@172355",
 
   "third_party/opus/src":
-    Var("chromium_trunk") + "/deps/third_party/opus@165487",
+    Var("chromium_trunk") + "/deps/third_party/opus@173498",
 
   "third_party/protobuf":
     Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
index 88b40e9b77..b60cee549b 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+++ b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
@@ -29,32 +29,4 @@
       ],
     },
   ],
-  'conditions': [
-    ['include_tests==1', {
-      'targets': [
-        {
-          'target_name': 'opus_demo',
-          'type': 'executable',
-          'dependencies': [
-            '<(DEPTH)/third_party/opus/opus.gyp:opus'
-          ],
-          'conditions': [
-            ['OS == "win"', {
-              'defines': [
-                'inline=__inline',
-              ],
-            }],
-          ],
-          'sources': [
-            '<(DEPTH)/third_party/opus/src/src/opus_demo.c',
-          ],
-          'include_dirs': [
-            '<(DEPTH)/third_party/opus/src/celt',
-            '<(DEPTH)/third_party/opus/src/include',
-            '<(DEPTH)/third_party/opus/src/silk',
-          ],
-        },
-      ],
-    }],
-  ],
 }