zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing NetEq's direct dependencies on Opus headers.

Browse Source 
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
This commit is contained in:
minyue@webrtc.org
2015-03-03 09:28:26 +00:00
parent cb04aa4a81
commit db93b68031
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/audio_coding/codecs/opus/opus.gypi
View File

@ -21,6 +21,15 @@
'dependencies': [ 'dependencies': [
'<(opus_dir)/opus.gyp:opus' '<(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': [ 'dependencies': [

16
webrtc/modules/audio_coding/neteq/neteq.gypi
View File

@ -26,7 +26,6 @@
], ],
'neteq_dependencies': [ 'neteq_dependencies': [
'<@(codecs)', '<@(codecs)',
'<(opus_dir)/opus.gyp:opus',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'audio_decoder_interface', 'audio_decoder_interface',
@ -43,21 +42,6 @@
'defines': [ 'defines': [
'<@(neteq_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': [ 'sources': [
'interface/neteq.h', 'interface/neteq.h',
'accelerate.cc', 'accelerate.cc',

1
webrtc/modules/audio_coding/neteq/neteq_tests.gypi
View File

@ -147,6 +147,7 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq', 'neteq',
'webrtc_opus',
], ],
'sources': [ 'sources': [
'test/audio_classifier_test.cc', 'test/audio_classifier_test.cc',