From db93b6803194c9a4a545d42f0f4034650b56e1a5 Mon Sep 17 00:00:00 2001 From: "minyue@webrtc.org" Date: Tue, 3 Mar 2015 09:28:26 +0000 Subject: [PATCH] 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 --- .../modules/audio_coding/codecs/opus/opus.gypi | 9 +++++++++ webrtc/modules/audio_coding/neteq/neteq.gypi | 16 ---------------- .../modules/audio_coding/neteq/neteq_tests.gypi | 1 + 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/webrtc/modules/audio_coding/codecs/opus/opus.gypi index 4b61220cf8..48c7bdff29 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 ccf30ee043..e7897d5759 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 e053eb456b..5b915df888 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',