From eb71e02f458da73701713b25e509a9b452b8bb92 Mon Sep 17 00:00:00 2001
From: "henrika@chromium.org"
 <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 26 Oct 2012 07:22:48 +0000
Subject: Roll Opus 162558:164159

The only difference in the new version is that opus_define.h doesn't try
to redefine OPUS_EXPORT, so now it is possible to define it in opus.gyp,
and the overrides hack is no longer needed.

Review URL: https://codereview.chromium.org/11274054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164281 0039d316-1c4b-4281-b951-d872f2087c98
---
 DEPS                                              |  2 +-
 third_party/opus/opus.gyp                         |  4 +---
 third_party/opus/overrides/include/opus_defines.h | 21 ---------------------
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 third_party/opus/overrides/include/opus_defines.h

diff --git a/DEPS b/DEPS
index a07bf3a..3e255e6 100644
--- a/DEPS
+++ b/DEPS
@@ -320,7 +320,7 @@ deps = {
     (Var("googlecode_url") % "pywebsocket") + "/trunk/src@662",
 
   "src/third_party/opus/src":
-    "/trunk/deps/third_party/opus@162558",
+    "/trunk/deps/third_party/opus@164159",
 }
 
 
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp
index ffd84c7..138e55f 100644
--- a/third_party/opus/opus.gyp
+++ b/third_party/opus/opus.gyp
@@ -14,6 +14,7 @@
           'type': 'static_library',
           'defines': [
             'OPUS_BUILD',
+            'OPUS_EXPORT=',
             'WORDS_BIGENDIAN',
           ],
           'conditions': [
@@ -34,8 +35,6 @@
             }],
           ],
           'include_dirs': [
-            '../..',
-            'overrides/include',
             'src/celt',
             'src/include',
             'src/silk',
@@ -43,7 +42,6 @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'overrides/include',
               'src/include',
             ],
           },
diff --git a/third_party/opus/overrides/include/opus_defines.h b/third_party/opus/overrides/include/opus_defines.h
deleted file mode 100644
index 205ede8..0000000
--- a/third_party/opus/overrides/include/opus_defines.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// HACK: This is a hack to make sure that we don't export opus symbols.
-// opus_defines.h sets OPUS_EXPORT only when OPUS_BUILD is defined.
-//
-// TODO(sergeyu): Fix opus to define OPUS_EXPORT only when it's not defined, add
-// OPUS_EXPORT='' define in opus.gyp and then remove this file.
-
-#if defined(OPUS_BUILD)
-#undef OPUS_BUILD
-#define OPUS_BUILD_DEFINED
-#endif  // defined(OPUS_BUILD)
-
-#include "third_party/opus/src/include/opus_defines.h"
-
-#if defined(OPUS_BUILD_DEFINED)
-#undef OPUS_BUILD_DEFINED
-#define OPUS_BUILD
-#endif  // defined(OPUS_BUILD_DEFINED)
-- 
cgit v1.1