From 611606297e6a78812b24b7a29b1242fc9e358992 Mon Sep 17 00:00:00 2001 From: "andresp@webrtc.org" Date: Thu, 18 Sep 2014 15:50:05 +0000 Subject: [PATCH] Trying to fix Chrome FYI bots. BUG=3831 TBR=perkj Review URL: https://webrtc-codereview.appspot.com/24629004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7223 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/video_capture/video_capture.gypi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index 1843405e0..e57d97a34 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -84,7 +84,11 @@ }, }, }], # mac - ['OS=="win"', { + # Note that since winsdk_samples isn't pulled into chromium gyp will + # fail to parse this rule and try to resolve the dependencies. This + # is not a problem since the internal video capture implementation + # should not be used in chrome - issue 3831. + ['OS=="win" and build_with_chromium==0', { 'dependencies': [ '<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directshow_baseclasses', ],