From 054ccd2e35d12877191c64852dd2a9b119d4825b Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Thu, 26 Sep 2013 09:22:09 +0000 Subject: [PATCH] Remove include_dirs from video_coding. BUG=1662 TEST=compile on trybots R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2294007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4853 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_coding/codecs/i420/main/source/i420.gypi | 11 ----------- .../codecs/test_framework/test_framework.gypi | 13 ------------- webrtc/modules/video_coding/codecs/vp8/vp8.gyp | 13 ------------- .../video_coding/main/source/video_coding.gypi | 12 ------------ .../video_coding/main/source/video_coding_test.gypi | 7 ------- 5 files changed, 56 deletions(-) diff --git a/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi b/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi index b62f73014c..dc2adcef15 100644 --- a/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi +++ b/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi @@ -14,17 +14,6 @@ 'dependencies': [ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], - 'include_dirs': [ - '../interface', - '../../../interface', - '../../../../../../common_video/interface', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../interface', - '../../../../../../common_video/interface', - ], - }, 'sources': [ '../interface/i420.h', 'i420.cc', diff --git a/webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi b/webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi index fe509803b9..0d046d102a 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi +++ b/webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi @@ -19,19 +19,6 @@ '<(webrtc_root)/test/metrics.gyp:metrics', '<(webrtc_root)/test/test.gyp:test_support', ], - - 'include_dirs': [ - '../interface', - '<(DEPTH)/testing/gtest/include', - '../../../../common_video/interface', - ], - - 'direct_dependent_settings': { - 'include_dirs': [ - '../interface', - ], - }, - 'sources': [ # header files 'benchmark.h', diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp index 972b381826..2fd31508f2 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp +++ b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp @@ -19,12 +19,6 @@ '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], - 'include_dirs': [ - 'include', - '<(webrtc_root)/common_video/interface', - '<(webrtc_root)/modules/video_coding/codecs/interface', - '<(webrtc_root)/modules/interface', - ], 'conditions': [ ['build_libvpx==1', { 'dependencies': [ @@ -32,13 +26,6 @@ ], }], ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'include', - '<(webrtc_root)/common_video/interface', - '<(webrtc_root)/modules/video_coding/codecs/interface', - ], - }, 'sources': [ 'reference_picture_selection.h', 'reference_picture_selection.cc', diff --git a/webrtc/modules/video_coding/main/source/video_coding.gypi b/webrtc/modules/video_coding/main/source/video_coding.gypi index 0c8644bc52..b4f6cb7b1c 100644 --- a/webrtc/modules/video_coding/main/source/video_coding.gypi +++ b/webrtc/modules/video_coding/main/source/video_coding.gypi @@ -18,18 +18,6 @@ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8', ], - 'include_dirs': [ - '../interface', - '../../../interface', - '../../codecs/interface', - '../../../../common_video/interface', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../interface', - '../../codecs/interface', - ], - }, 'sources': [ # interfaces '../interface/video_coding.h', diff --git a/webrtc/modules/video_coding/main/source/video_coding_test.gypi b/webrtc/modules/video_coding/main/source/video_coding_test.gypi index 9dd68af6c2..a64e02d02c 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_test.gypi +++ b/webrtc/modules/video_coding/main/source/video_coding_test.gypi @@ -21,13 +21,6 @@ '<(webrtc_root)/test/metrics.gyp:metrics', '<(webrtc_root)/common_video/common_video.gyp:common_video', ], - 'include_dirs': [ - '../../../interface', - '../../codecs/vp8/include', - '../../../../system_wrappers/interface', - '../../../../common_video/interface', - '../source', - ], 'sources': [ # headers '../test/codec_database_test.h',