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

Move audio_coding_module.gypi from main/acm2 to main/.

Browse Source 
Prevents presubmit failures when touching audio_coding_module.gypi due
to source files being included from outside the gypi directory.

BUG=
R=minyue@webrtc.org

Review URL: https://codereview.webrtc.org/1262333002 .

Cr-Commit-Position: refs/heads/master@{#9659}
This commit is contained in:
Peter Boström
2015-07-30 11:34:01 +02:00
parent e2cb1f12c3
commit 9a6e74179c
2 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi → webrtc/modules/audio_coding/main/audio_coding_module.gypi
View File

@ -42,40 +42,40 @@
'neteq',
],
'include_dirs': [
'../interface',
'../../../interface',
'interface',
'../../interface',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'../../../interface',
'interface',
'../../interface',
'<(webrtc_root)',
],
},
'sources': [
'../interface/audio_coding_module.h',
'../interface/audio_coding_module_typedefs.h',
'acm_codec_database.cc',
'acm_codec_database.h',
'acm_common_defs.h',
'acm_receiver.cc',
'acm_receiver.h',
'acm_resampler.cc',
'acm_resampler.h',
'audio_coding_module.cc',
'audio_coding_module_impl.cc',
'audio_coding_module_impl.h',
'call_statistics.cc',
'call_statistics.h',
'codec_manager.cc',
'codec_manager.h',
'codec_owner.cc',
'codec_owner.h',
'initial_delay_manager.cc',
'initial_delay_manager.h',
'nack.cc',
'nack.h',
'acm2/acm_codec_database.cc',
'acm2/acm_codec_database.h',
'acm2/acm_common_defs.h',
'acm2/acm_receiver.cc',
'acm2/acm_receiver.h',
'acm2/acm_resampler.cc',
'acm2/acm_resampler.h',
'acm2/audio_coding_module.cc',
'acm2/audio_coding_module_impl.cc',
'acm2/audio_coding_module_impl.h',
'acm2/call_statistics.cc',
'acm2/call_statistics.h',
'acm2/codec_manager.cc',
'acm2/codec_manager.h',
'acm2/codec_owner.cc',
'acm2/codec_owner.h',
'acm2/initial_delay_manager.cc',
'acm2/initial_delay_manager.h',
'acm2/nack.cc',
'acm2/nack.h',
'interface/audio_coding_module.h',
'interface/audio_coding_module_typedefs.h',
],
},
],
@ -95,10 +95,10 @@
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'acm_receive_test.cc',
'acm_receive_test.h',
'acm_receive_test_oldapi.cc',
'acm_receive_test_oldapi.h',
'acm2/acm_receive_test.cc',
'acm2/acm_receive_test.h',
'acm2/acm_receive_test_oldapi.cc',
'acm2/acm_receive_test_oldapi.h',
],
}, # acm_receive_test
{
@ -114,10 +114,10 @@
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'acm_send_test.cc',
'acm_send_test.h',
'acm_send_test_oldapi.cc',
'acm_send_test_oldapi.h',
'acm2/acm_send_test.cc',
'acm2/acm_send_test.h',
'acm2/acm_send_test_oldapi.cc',
'acm2/acm_send_test_oldapi.h',
],
}, # acm_send_test
{
@ -133,10 +133,10 @@
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
],
'sources': [
'../test/delay_test.cc',
'../test/Channel.cc',
'../test/PCMFile.cc',
'../test/utility.cc',
'test/delay_test.cc',
'test/Channel.cc',
'test/PCMFile.cc',
'test/utility.cc',
],
}, # delay_test
{
@ -152,9 +152,9 @@
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
],
'sources': [
'../test/insert_packet_with_timing.cc',
'../test/Channel.cc',
'../test/PCMFile.cc',
'test/insert_packet_with_timing.cc',
'test/Channel.cc',
'test/PCMFile.cc',
],
}, # delay_test
],