| commit | c760f53e988be2e921395a364cfbdb76dd10a63a | [log] [tgz] |
|---|---|---|
| author | andresp@webrtc.org <andresp@webrtc.org> | Thu Sep 18 15:50:05 2014 +0000 |
| committer | andresp@webrtc.org <andresp@webrtc.org> | Thu Sep 18 15:50:05 2014 +0000 |
| tree | 5f626c2cfbd5c0819b157c4ffcc37ea5a7aa4d28 | |
| parent | 6b97015d433f126e835178e2b59bc847d1af85a5 [diff] |
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/webrtc@7223 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/video_capture/video_capture.gypi b/modules/video_capture/video_capture.gypi index 1843405..e57d97a 100644 --- a/modules/video_capture/video_capture.gypi +++ b/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', ],