Index: webrtc/modules/audio_coding/neteq/neteq_tests.gypi |
diff --git a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi |
index 1cf4053c7c51741b29225c472c3aec91c83ca4f0..4b0409216296235db2abaa3061ccd625a33615bf 100644 |
--- a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi |
+++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi |
@@ -12,11 +12,11 @@ |
'target_name': 'neteq_rtpplay', |
'type': 'executable', |
'dependencies': [ |
+ '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
+ '<(webrtc_root)/test/test.gyp:test_support_main', |
'neteq', |
'neteq_unittest_tools', |
- 'PCM16B', |
- '<(webrtc_root)/test/test.gyp:test_support_main', |
- '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
+ 'pcm16b', |
], |
'sources': [ |
'tools/neteq_rtpplay.cc', |
@@ -30,14 +30,14 @@ |
'type': 'executable', |
'dependencies': [ |
# TODO(hlundin): Make RTPencode use ACM to encode files. |
- 'neteq_test_tools',# Test helpers |
- 'G711', |
- 'G722', |
- 'PCM16B', |
- 'iLBC', |
- 'iSAC', |
- 'CNG', |
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', |
+ 'cng', |
+ 'g711', |
+ 'g722', |
+ 'ilbc', |
+ 'isac', |
+ 'neteq_test_tools', # Test helpers |
+ 'pcm16b', |
], |
'defines': [ |
'CODEC_ILBC', |
@@ -84,10 +84,10 @@ |
'target_name': 'rtp_analyze', |
'type': 'executable', |
'dependencies': [ |
- 'neteq_unittest_tools', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', |
+ 'neteq_unittest_tools', |
], |
'sources': [ |
'tools/rtp_analyze.cc', |
@@ -98,8 +98,8 @@ |
'target_name': 'RTPchange', |
'type': 'executable', |
'dependencies': [ |
- 'neteq_test_tools', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
+ 'neteq_test_tools', |
], |
'sources': [ |
'test/RTPchange.cc', |
@@ -110,8 +110,8 @@ |
'target_name': 'RTPtimeshift', |
'type': 'executable', |
'dependencies': [ |
- 'neteq_test_tools', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
+ 'neteq_test_tools', |
], |
'sources': [ |
'test/RTPtimeshift.cc', |
@@ -134,8 +134,8 @@ |
'target_name': 'rtp_to_text', |
'type': 'executable', |
'dependencies': [ |
- 'neteq_test_tools', |
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', |
+ 'neteq_test_tools', |
], |
'sources': [ |
'test/rtp_to_text.cc', |
@@ -158,11 +158,11 @@ |
'target_name': 'neteq_test_support', |
'type': 'static_library', |
'dependencies': [ |
- 'neteq', |
- 'PCM16B', |
- 'neteq_unittest_tools', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
+ 'neteq', |
+ 'neteq_unittest_tools', |
+ 'pcm16b', |
], |
'sources': [ |
'tools/neteq_external_decoder_test.cc', |
@@ -178,10 +178,10 @@ |
'target_name': 'neteq_speed_test', |
'type': 'executable', |
'dependencies': [ |
- 'neteq', |
- 'neteq_test_support', |
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
'<(webrtc_root)/test/test.gyp:test_support_main', |
+ 'neteq', |
+ 'neteq_test_support', |
], |
'sources': [ |
'test/neteq_speed_test.cc', |
@@ -192,12 +192,12 @@ |
'target_name': 'neteq_opus_quality_test', |
'type': 'executable', |
'dependencies': [ |
- 'neteq', |
- 'neteq_test_support', |
- 'webrtc_opus', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
'<(webrtc_root)/test/test.gyp:test_support_main', |
+ 'neteq', |
+ 'neteq_test_support', |
+ 'webrtc_opus', |
], |
'sources': [ |
'test/neteq_opus_quality_test.cc', |
@@ -208,12 +208,12 @@ |
'target_name': 'neteq_isac_quality_test', |
'type': 'executable', |
'dependencies': [ |
- 'neteq', |
- 'neteq_test_support', |
- 'iSACFix', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
'<(webrtc_root)/test/test.gyp:test_support_main', |
+ 'isac_fix', |
+ 'neteq', |
+ 'neteq_test_support', |
], |
'sources': [ |
'test/neteq_isac_quality_test.cc', |
@@ -224,12 +224,12 @@ |
'target_name': 'neteq_pcmu_quality_test', |
'type': 'executable', |
'dependencies': [ |
- 'neteq', |
- 'neteq_test_support', |
- 'G711', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
'<(webrtc_root)/test/test.gyp:test_support_main', |
+ 'g711', |
+ 'neteq', |
+ 'neteq_test_support', |
], |
'sources': [ |
'test/neteq_pcmu_quality_test.cc', |
@@ -240,12 +240,12 @@ |
'target_name': 'neteq_ilbc_quality_test', |
'type': 'executable', |
'dependencies': [ |
- 'neteq', |
- 'neteq_test_support', |
- 'iLBC', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', |
'<(webrtc_root)/test/test.gyp:test_support_main', |
+ 'neteq', |
+ 'neteq_test_support', |
+ 'ilbc', |
], |
'sources': [ |
'test/neteq_ilbc_quality_test.cc', |
@@ -261,14 +261,14 @@ |
'neteq_dummy_rtp%': 0, |
}, |
'dependencies': [ |
- 'G711', |
- 'G722', |
- 'PCM16B', |
- 'iLBC', |
- 'iSAC', |
- 'CNG', |
- '<(webrtc_root)/common.gyp:webrtc_common', |
'<(DEPTH)/testing/gtest.gyp:gtest', |
+ '<(webrtc_root)/common.gyp:webrtc_common', |
+ 'cng', |
+ 'g711', |
+ 'g722', |
+ 'ilbc', |
+ 'isac', |
+ 'pcm16b', |
], |
'direct_dependent_settings': { |
'include_dirs': [ |