From 88f94f985e4e0045a5271c93db307f93e2aa9e1b Mon Sep 17 00:00:00 2001 From: "xians@google.com" Date: Fri, 5 Aug 2011 16:14:51 +0000 Subject: [PATCH] exclude the ACM test target from building with chromium. Review URL: http://webrtc-codereview.appspot.com/95011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@312 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/audio_coding_module.gyp | 71 ++++++++++--------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/src/modules/audio_coding/main/source/audio_coding_module.gyp b/src/modules/audio_coding/main/source/audio_coding_module.gyp index b5753bf9fb..79f8d1cc12 100644 --- a/src/modules/audio_coding/main/source/audio_coding_module.gyp +++ b/src/modules/audio_coding/main/source/audio_coding_module.gyp @@ -94,40 +94,47 @@ 'audio_coding_module_impl.h', ], }, - { - 'target_name': 'audio_coding_module_test', - 'type': 'executable', - 'dependencies': [ - 'audio_coding_module', - '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', - ], - 'sources': [ - '../test/ACMTest.cpp', - '../test/APITest.cpp', - '../test/Channel.cpp', - '../test/EncodeDecodeTest.cpp', - '../test/EncodeToFileTest.cpp', - '../test/iSACTest.cpp', - '../test/PCMFile.cpp', - '../test/RTPFile.cpp', - '../test/SpatialAudio.cpp', - '../test/TestAllCodecs.cpp', - '../test/Tester.cpp', - '../test/TestFEC.cpp', - '../test/TestStereo.cpp', - '../test/TestVADDTX.cpp', - '../test/TimedTrace.cpp', - '../test/TwoWayCommunication.cpp', - '../test/utility.cpp', - ], - 'conditions': [ - ['OS=="linux"', { - 'cflags': [ - '-fexceptions', # enable exceptions + ], + # Exclude the test targets when building with chromium. + 'conditions': [ + ['build_with_chromium==0', { + 'targets': [ + { + 'target_name': 'audio_coding_module_test', + 'type': 'executable', + 'dependencies': [ + 'audio_coding_module', + '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', ], - }], + 'sources': [ + '../test/ACMTest.cpp', + '../test/APITest.cpp', + '../test/Channel.cpp', + '../test/EncodeDecodeTest.cpp', + '../test/EncodeToFileTest.cpp', + '../test/iSACTest.cpp', + '../test/PCMFile.cpp', + '../test/RTPFile.cpp', + '../test/SpatialAudio.cpp', + '../test/TestAllCodecs.cpp', + '../test/Tester.cpp', + '../test/TestFEC.cpp', + '../test/TestStereo.cpp', + '../test/TestVADDTX.cpp', + '../test/TimedTrace.cpp', + '../test/TwoWayCommunication.cpp', + '../test/utility.cpp', + ], + 'conditions': [ + ['OS=="linux"', { + 'cflags': [ + '-fexceptions', # enable exceptions + ], + }], + ], + }, ], - }, + }], ], }