Prepare to use generated shim headers for speex
This will require a DEPS roll and corresponding changes
to chromium-side .cc files.
BUG=165264
Review URL: https://codereview.chromium.org/11753019
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/speex@175205 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/speex.gyp b/speex.gyp
index ea5e0ef..adf1413 100644
--- a/speex.gyp
+++ b/speex.gyp
@@ -95,13 +95,30 @@
{
'target_name': 'libspeex',
'type': 'none',
+ 'variables': {
+ 'headers_root_path': 'include',
+ 'header_filenames': [
+ 'speex/speex_types.h',
+ 'speex/speex_callbacks.h',
+ 'speex/speex_config_types.h',
+ 'speex/speex_stereo.h',
+ 'speex/speex_echo.h',
+ 'speex/speex_preprocess.h',
+ 'speex/speex_jitter.h',
+ 'speex/speex.h',
+ 'speex/speex_resampler.h',
+ 'speex/speex_buffer.h',
+ 'speex/speex_header.h',
+ 'speex/speex_bits.h',
+ ],
+ },
+ 'includes': [
+ '../../build/shim_headers.gypi',
+ ],
'direct_dependent_settings': {
'cflags': [
'<!@(pkg-config --cflags speex)',
],
- 'defines': [
- 'USE_SYSTEM_SPEEX',
- ],
},
'link_settings': {
'ldflags': [
diff --git a/speex.h b/speex.h
deleted file mode 100644
index c4b6da9..0000000
--- a/speex.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef THIRD_PARTY_SPEEX_SPEEX_H_
-#define THIRD_PARTY_SPEEX_SPEEX_H_
-#pragma once
-
-// This is a shim header to include the right speex header.
-// Use this instead of referencing the speex header directly.
-
-#if defined(USE_SYSTEM_SPEEX)
-#include <speex/speex.h>
-#include <speex/speex_callbacks.h>
-#include <speex/speex_stereo.h>
-#else
-#include "third_party/speex/include/speex/speex.h"
-#include "third_party/speex/include/speex/speex_callbacks.h"
-#include "third_party/speex/include/speex/speex_stereo.h"
-#endif
-
-#endif // THIRD_PARTY_SPEEX_SPEEX_H_
