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

Remove <(webrtc_root) from source file entries.

Browse Source 
This required to move the AGC tools source files
into webrtc/tools and create a new agc_test_utils target.

Since audio_codec_speed_tests.gypi referenced sources above,
the best approach I could come up with was to add an audio_coding.gypi
file at a higher level and move the targets in there (+ the includes from
modules.gyp which is an improvement IMO).

I also added a PRESUBMIT.py check to prevent new source
entries being added with <(webrtc_root) in the path.

BUG=4185
R=andrew@webrtc.org, tina.legrand@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8197}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8197 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
2015-01-29 10:23:45 +00:00
parent 73ca1945ec
commit 2d2a1f9f05
18 changed files with 129 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/modules/modules.gyp
View File

@ -9,17 +9,7 @@
{
'includes': [
'../build/common.gypi',
'audio_coding/codecs/interfaces.gypi',
'audio_coding/codecs/cng/cng.gypi',
'audio_coding/codecs/g711/g711.gypi',
'audio_coding/codecs/g722/g722.gypi',
'audio_coding/codecs/ilbc/ilbc.gypi',
'audio_coding/codecs/isac/main/source/isac.gypi',
'audio_coding/codecs/isac/fix/source/isacfix.gypi',
'audio_coding/codecs/pcm16b/pcm16b.gypi',
'audio_coding/codecs/red/red.gypi',
'audio_coding/main/acm2/audio_coding_module.gypi',
'audio_coding/neteq/neteq.gypi',
'audio_coding/audio_coding.gypi',
'audio_conference_mixer/source/audio_conference_mixer.gypi',
'audio_device/audio_device.gypi',
'audio_processing/audio_processing.gypi',
@ -37,14 +27,8 @@
'video_render/video_render.gypi',
],
'conditions': [
['include_opus==1', {
'includes': ['audio_coding/codecs/opus/opus.gypi',],
}],
['include_tests==1', {
'includes': [
'audio_coding/codecs/isac/isac_test.gypi',
'audio_coding/codecs/isac/isacfix_test.gypi',
'audio_coding/codecs/tools/audio_codec_speed_tests.gypi',
'audio_processing/audio_processing_tests.gypi',
'rtp_rtcp/test/testFec/test_fec.gypi',
'video_coding/main/source/video_coding_test.gypi',
@ -101,6 +85,7 @@
'<(webrtc_root)/test/test.gyp:frame_generator',
'<(webrtc_root)/test/test.gyp:rtp_test_utils',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(webrtc_root)/tools/tools.gyp:agc_test_utils',
],
'sources': [
'audio_coding/codecs/cng/audio_encoder_cng_unittest.cc',
@ -175,7 +160,6 @@
'audio_processing/agc/pitch_internal_unittest.cc',
'audio_processing/agc/pole_zero_filter_unittest.cc',
'audio_processing/agc/standalone_vad_unittest.cc',
'audio_processing/agc/test/test_utils.cc',
'audio_processing/beamformer/complex_matrix_unittest.cc',
'audio_processing/beamformer/covariance_matrix_generator_unittest.cc',
'audio_processing/beamformer/matrix_unittest.cc',