From 1c974ef5e37c87efbd85ea8b6bc7e21ebe1ad448 Mon Sep 17 00:00:00 2001
From: "pbos@webrtc.org" <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 30 Sep 2013 15:32:10 +0000
Subject: [PATCH] Remove include_dirs from video_capture.

BUG=1662
TEST=compile on trybots
R=mflodman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4880 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../video_capture/mac/video_capture_mac.mm    |  4 ++--
 .../modules/video_capture/video_capture.gypi  | 20 -------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/webrtc/modules/video_capture/mac/video_capture_mac.mm b/webrtc/modules/video_capture/mac/video_capture_mac.mm
index 661b0f7b4e..aeb8de6ae4 100644
--- a/webrtc/modules/video_capture/mac/video_capture_mac.mm
+++ b/webrtc/modules/video_capture/mac/video_capture_mac.mm
@@ -27,8 +27,8 @@
 #include <QuickTime/video_capture_quick_time.h>
 #include <QuickTime/video_capture_quick_time_info.h>
 #else
-#include <QTKit/video_capture_qtkit.h>
-#include <QTKit/video_capture_qtkit_info.h>
+#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h"
+#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h"
 #endif
 
 namespace webrtc
diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi
index f2cecd1a40..1e392609bf 100644
--- a/webrtc/modules/video_capture/video_capture.gypi
+++ b/webrtc/modules/video_capture/video_capture.gypi
@@ -16,11 +16,6 @@
         '<(webrtc_root)/common_video/common_video.gyp:common_video',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
-      'include_dirs': [
-        'include',
-        '../interface',
-        '<(webrtc_root)/common_video/libyuv/include',
-      ],
       'sources': [
         'device_info_impl.cc',
         'device_info_impl.h',
@@ -42,9 +37,6 @@
         }, {  # include_internal_video_capture == 1
           'conditions': [
             ['OS=="linux"', {
-              'include_dirs': [
-                'linux',
-              ],
               'sources': [
                 'linux/device_info_linux.cc',
                 'linux/device_info_linux.h',
@@ -65,9 +57,6 @@
                 'mac/qtkit/video_capture_qtkit_utility.h',
                 'mac/video_capture_mac.mm',
               ],
-              'include_dirs': [
-                'mac',
-              ],
               'link_settings': {
                 'xcode_settings': {
                   'OTHER_LDFLAGS': [
@@ -80,9 +69,6 @@
               'dependencies': [
                 '<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directshow_baseclasses',
               ],
-              'include_dirs': [
-                'windows',
-              ],
               'sources': [
                 'windows/device_info_ds.cc',
                 'windows/device_info_ds.h',
@@ -105,9 +91,6 @@
               },
             }],  # win
             ['OS=="android"', {
-              'include_dirs': [
-                'android',
-              ],
               'sources': [
                 'android/device_info_android.cc',
                 'android/device_info_android.h',
@@ -154,9 +137,6 @@
             '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<(DEPTH)/testing/gtest.gyp:gtest',
           ],
-          'include_dirs': [
-            'include',
-          ],
           'sources': [
             'test/video_capture_unittest.cc',
             'test/video_capture_main_mac.mm',