Removing NetEq's direct dependencies on Opus headers.
Neteq had a direct dependency on Chromium/third_party/opus. This should be relayed by target webrtc_opus.
BUG=
R=henrik.lundin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/42529004
Cr-Commit-Position: refs/heads/master@{#8567}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8567 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
index 4b61220..48c7bdf 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+++ b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
@@ -21,6 +21,15 @@
'dependencies': [
'<(opus_dir)/opus.gyp:opus'
],
+ 'export_dependent_settings': [
+ '<(opus_dir)/opus.gyp:opus',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [ # need by Neteq audio classifier.
+ '<(opus_dir)/src/src',
+ '<(opus_dir)/src/celt',
+ ],
+ },
}],
],
'dependencies': [
diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi
index ccf30ee..e7897d5 100644
--- a/webrtc/modules/audio_coding/neteq/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq.gypi
@@ -26,7 +26,6 @@
],
'neteq_dependencies': [
'<@(codecs)',
- '<(opus_dir)/opus.gyp:opus',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'audio_decoder_interface',
@@ -43,21 +42,6 @@
'defines': [
'<@(neteq_defines)',
],
- 'include_dirs': [
- # Need Opus header files for the audio classifier.
- '<(DEPTH)/third_party/opus/src/celt',
- '<(DEPTH)/third_party/opus/src/src',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- # Need Opus header files for the audio classifier.
- '<(DEPTH)/third_party/opus/src/celt',
- '<(DEPTH)/third_party/opus/src/src',
- ],
- },
- 'export_dependent_settings': [
- '<(opus_dir)/opus.gyp:opus',
- ],
'sources': [
'interface/neteq.h',
'accelerate.cc',
diff --git a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
index e053eb4..5b915df 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
@@ -147,6 +147,7 @@
'type': 'executable',
'dependencies': [
'neteq',
+ 'webrtc_opus',
],
'sources': [
'test/audio_classifier_test.cc',
