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

Move audio_codec_speed_tests into include_tests==1 condition.

Browse Source 
I made a mistake in https://webrtc-codereview.appspot.com/37859004
and moved this target out of the include_tests==1 condition.
This moves it back in.

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

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

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

54
webrtc/modules/audio_coding/audio_coding.gypi
View File

@ -21,33 +21,6 @@
'main/acm2/audio_coding_module.gypi',
'neteq/neteq.gypi',
],
'targets': [
{
'target_name': 'audio_codec_speed_tests',
'type': '<(gtest_target_type)',
'dependencies': [
'audio_processing',
'iSACFix',
'webrtc_opus',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'codecs/isac/fix/test/isac_speed_test.cc',
'codecs/opus/opus_speed_test.cc',
'codecs/tools/audio_codec_speed_test.h',
'codecs/tools/audio_codec_speed_test.cc',
],
'conditions': [
['OS=="android"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],
}],
],
},
],
'conditions': [
['include_opus==1', {
'includes': ['codecs/opus/opus.gypi',],
@ -57,6 +30,33 @@
'codecs/isac/isac_test.gypi',
'codecs/isac/isacfix_test.gypi',
],
'targets': [
{
'target_name': 'audio_codec_speed_tests',
'type': '<(gtest_target_type)',
'dependencies': [
'audio_processing',
'iSACFix',
'webrtc_opus',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'codecs/isac/fix/test/isac_speed_test.cc',
'codecs/opus/opus_speed_test.cc',
'codecs/tools/audio_codec_speed_test.h',
'codecs/tools/audio_codec_speed_test.cc',
],
'conditions': [
['OS=="android"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],
}],
],
},
],
}],
['OS=="android"', {
'targets': [