From c3e7d3048306f57265363fef885412dfffdad31a Mon Sep 17 00:00:00 2001 From: "xians@google.com" Date: Mon, 8 Aug 2011 12:52:47 +0000 Subject: [PATCH] exclude vplib test target from building with chromium BUG=http://code.google.com/p/webrtc/issues/detail?id=34 Test=None Review URL: http://webrtc-codereview.appspot.com/92010 git-svn-id: http://webrtc.googlecode.com/svn/trunk@325 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/common_video/vplib/main/source/vplib.gyp | 49 +++++++++++--------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/src/common_video/vplib/main/source/vplib.gyp b/src/common_video/vplib/main/source/vplib.gyp index e21a503e31..c7533c0a58 100644 --- a/src/common_video/vplib/main/source/vplib.gyp +++ b/src/common_video/vplib/main/source/vplib.gyp @@ -39,29 +39,36 @@ 'scale_bilinear_yuv.cc', ], }, - { - 'target_name': 'vplib_test', - 'type': 'executable', - 'dependencies': [ - 'webrtc_vplib', - ], - 'include_dirs': [ - '../interface', - '../source', - ], - 'sources': [ + ], # targets + # Exclude the test target when building with chromium. + 'conditions': [ + ['build_with_chromium==0', { + 'targets': [ + { + 'target_name': 'vplib_test', + 'type': 'executable', + 'dependencies': [ + 'webrtc_vplib', + ], + 'include_dirs': [ + '../interface', + '../source', + ], + 'sources': [ - # headers - '../test/test_util.h', + # headers + '../test/test_util.h', - # sources - '../test/tester_main.cc', - '../test/scale_test.cc', - '../test/convert_test.cc', - '../test/interpolation_test.cc', - ], # source - }, - ], + # sources + '../test/tester_main.cc', + '../test/scale_test.cc', + '../test/convert_test.cc', + '../test/interpolation_test.cc', + ], # source + }, + ], # targets + }], # build_with_chromium + ], # conditions } # Local Variables: