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

Add merge_libs_dependencies and remove voice_engine_dependencies.

Browse Source 
TBR=wu,turaj
TESTED=trybots
Review URL: https://webrtc-codereview.appspot.com/798006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2777 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2012-09-15 02:50:52 +00:00
parent 19f200edf3
commit 0be1f234b6
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/build/merge_libs.gyp
View File

@@ -7,15 +7,20 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [ 'common.gypi', ],
'includes': ['common.gypi',],
'variables': {
'merge_libs_dependencies': [
'../video_engine/video_engine.gyp:video_engine_core',
],
},
'targets': [
{
'target_name': 'no_op',
'type': 'executable',
'dependencies': [
'../video_engine/video_engine.gyp:video_engine_core',
'<@(merge_libs_dependencies)',
],
'sources': [ 'no_op.cc', ],
'sources': ['no_op.cc',],
},
{
'target_name': 'merged_lib',

27
src/voice_engine/voice_engine_core.gypi
View File

@@ -7,27 +7,22 @@
# be found in the AUTHORS file in the root of the source tree.
{
'variables': {
'voice_engine_dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/modules/modules.gyp:audio_coding_module',
'<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
'<(webrtc_root)/modules/modules.gyp:audio_device',
'<(webrtc_root)/modules/modules.gyp:audio_processing',
'<(webrtc_root)/modules/modules.gyp:media_file',
'<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
'<(webrtc_root)/modules/modules.gyp:udp_transport',
'<(webrtc_root)/modules/modules.gyp:webrtc_utility',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
},
'targets': [
{
'target_name': 'voice_engine_core',
'type': '<(library)',
'dependencies': [
'<@(voice_engine_dependencies)',
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/modules/modules.gyp:audio_coding_module',
'<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
'<(webrtc_root)/modules/modules.gyp:audio_device',
'<(webrtc_root)/modules/modules.gyp:audio_processing',
'<(webrtc_root)/modules/modules.gyp:media_file',
'<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
'<(webrtc_root)/modules/modules.gyp:udp_transport',
'<(webrtc_root)/modules/modules.gyp:webrtc_utility',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'include',