generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Consolidate common_audio into a single target.

Browse Source 
In principle should reduce gyp processing time, but the difference was not measurable. In any case, it's a good simplification that aligns with having a single common_video target.

R=bjornv@webrtc.org, kma@webrtc.org, tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1375004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3928 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2013-04-30 23:43:26 +00:00
parent dff69c56b0
commit 342353780d
19 changed files with 212 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_coding/codecs/cng/cng.gypi
View File

@@ -12,7 +12,7 @@
'target_name': 'CNG',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
],
'include_dirs': [
'include',

2
webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi
View File

@@ -12,7 +12,7 @@
'target_name': 'iLBC',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
],
'include_dirs': [
'interface',

4
webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
View File

@@ -12,7 +12,7 @@
'target_name': 'iSACFix',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
@@ -94,7 +94,7 @@
'type': 'static_library',
'includes': ['../../../../../../build/arm_neon.gypi',],
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
],
'sources': [
'entropy_coding_neon.c',

2
webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
View File

@@ -12,7 +12,7 @@
'target_name': 'iSAC',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
],
'include_dirs': [
'../interface',

6
webrtc/modules/audio_coding/main/source/audio_coding_module.gypi
View File

@@ -17,9 +17,7 @@
'iSACFix',
'PCM16B',
'NetEq',
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/common_audio/common_audio.gyp:vad',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'audio_coding_defines': [],
@@ -177,7 +175,7 @@
'NetEq4TestTools',
'neteq_unittest_tools',
'PCM16B', # Needed by NetEq tests.
'<(webrtc_root)/common_audio/common_audio.gyp:vad',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/test/test.gyp:test_support_main',

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

@@ -13,7 +13,7 @@
'type': 'static_library',
'dependencies': [
'CNG',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
],
'defines': [
'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which

5
webrtc/modules/audio_coding/neteq4/neteq.gypi
View File

@@ -16,8 +16,7 @@
'iSAC',
'iSACFix',
'CNG',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/common_audio/common_audio.gyp:vad',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'neteq_defines': [],
@@ -129,7 +128,7 @@
'dependencies': [
'<@(neteq_dependencies)',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'defines': [

2
webrtc/modules/audio_coding/neteq4/neteq_tests.gypi
View File

@@ -36,7 +36,7 @@
'iLBC',
'iSAC',
'CNG',
'<(webrtc_root)/common_audio/common_audio.gyp:vad',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
],
'defines': [
'CODEC_ILBC',