commit 9532fa53ed5a5beb2224c8d7a3802e38ed16b8b0
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Sep 30 15:32:44 2013
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Sep 30 15:32:44 2013
tree 0cf62092ea5f0fc446ad37a6a3cd6232341f42f3
parent 1c974ef5e37c87efbd85ea8b6bc7e21ebe1ad448

Remove include_dirs from video_render.

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

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4881 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/video_render/test/testAPI/testAPI_mac.mm

diff --git a/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm b/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm
index 0127a59..8ebb9ce 100644
--- a/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm
+++ b/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm
@@ -18,14 +18,14 @@
 #import <QTKit/QTKit.h>
 #include <sys/time.h>
 
-#include "common_types.h"
-#import "webrtc/modules/video_render//mac/cocoa_render_view.h"
-#include "module_common_types.h"
-#include "process_thread.h"
-#include "tick_util.h"
-#include "trace.h"
-#include "video_render_defines.h"
-#include "video_render.h"
+#import "webrtc/modules/video_render/mac/cocoa_render_view.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/modules/video_render/include/video_render.h"
+#include "webrtc/modules/video_render/include/video_render_defines.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 using namespace webrtc;
 

webrtc/modules/video_render/video_render.gypi

diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi
index 58bdceb..f8662c3 100644
--- a/webrtc/modules/video_render/video_render.gypi
+++ b/webrtc/modules/video_render/video_render.gypi
@@ -16,16 +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',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          'include',
-          '../interface',
-        ],
-      },
       'sources': [
         'android/video_render_android_impl.cc',
         'android/video_render_android_impl.h',
@@ -150,11 +140,6 @@
             },
           },
         }],
-        ['OS=="mac"', {
-          'direct_dependent_settings': {
-            'include_dirs': ['mac',],
-          },
-        }],
         ['OS=="win" and include_internal_video_render==1', {
           'variables': {
             # 'directx_sdk_path' will be overridden in the condition block