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

Fix the Android compilation (better structure for NetEq test libs)

Browse Source 
This change should make the Android targets compile again. The reason
for the failure was a highly dubious structure in the gypi files. With
this fix, the structure is somewhat cleaner. Still room for improvement.

BUG=3254
TBR=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5972 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2014-04-24 13:19:04 +00:00
parent 5ca6a5387e
commit d57b8149c2
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/audio_coding/neteq4/neteq.gypi
View File

@@ -168,9 +168,6 @@
'target_name': 'neteq_unittest_tools',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'PCM16B', # Needed by neteq_performance_test.
'rtp_rtcp',
],
'direct_dependent_settings': {
@@ -186,8 +183,6 @@
'tools/audio_loop.h',
'tools/input_audio_file.cc',
'tools/input_audio_file.h',
'tools/neteq_performance_test.cc',
'tools/neteq_performance_test.h',
'tools/packet.cc',
'tools/packet.h',
'tools/packet_source.h',
@@ -195,8 +190,6 @@
'tools/rtp_file_source.h',
'tools/rtp_generator.cc',
'tools/rtp_generator.h',
'tools/neteq_quality_test.cc',
'tools/neteq_quality_test.h',
],
}, # neteq_unittest_tools
], # targets

23
webrtc/modules/audio_coding/neteq4/neteq_tests.gypi
View File

@@ -153,13 +153,30 @@
],
},
{
'target_name': 'neteq_test_support',
'type': 'static_library',
'dependencies': [
'NetEq4',
'PCM16B',
'neteq_unittest_tools',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
],
'sources': [
'tools/neteq_performance_test.cc',
'tools/neteq_performance_test.h',
'tools/neteq_quality_test.cc',
'tools/neteq_quality_test.h',
],
}, # neteq_test_support
{
'target_name': 'neteq4_speed_test',
'type': 'executable',
'dependencies': [
'NetEq4',
'neteq_unittest_tools',
'PCM16B',
'neteq_test_support',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
@@ -173,7 +190,7 @@
'type': 'executable',
'dependencies': [
'NetEq4',
'neteq_unittest_tools',
'neteq_test_support',
'webrtc_opus',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',