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

Use neteq_unittest_tools in audio_decoder_unittests

Browse Source 
With the recent move of RtpFileReader to the rtp_test_utils target
(in r7536), it is now possible to let audio_decoder_unittests depend
on neteq_unittest_tools without breaking the Android build.

BUG=2692
TBR=tina.legrand@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7542 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2014-10-28 09:47:13 +00:00
parent 820efd5b55
commit ff8a98e352
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,7 @@
'type': '<(gtest_target_type)',
'dependencies': [
'<@(codecs)',
'neteq_unittest_tools',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/test/test.gyp:test_support_main',
@ -155,14 +156,6 @@
'audio_decoder_unittest.cc',
'audio_decoder.cc',
'interface/audio_decoder.h',
# The files below are from the neteq_unittest_tools target, but that
# target depends (through long dependency chains) on the neteq
# target, which creates a conflict with the audio_decoder_impl.*
# files.
'tools/input_audio_file.cc',
'tools/input_audio_file.h',
'tools/resample_input_audio_file.cc',
'tools/resample_input_audio_file.h',
],
'conditions': [
['OS=="android"', {
@ -178,7 +171,7 @@
'type': 'static_library',
'dependencies': [
'rtp_rtcp',
'<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
'<(webrtc_root)/test/test.gyp:rtp_test_utils',
],
'direct_dependent_settings': {
'include_dirs': [