Remove include_dirs from test/test.gyp.

This is a cleanup step for having root-relative includes, include_dirs shouldn't be needed anymore.

BUG=1662
R=phoglund@webrtc.org, tina.legrand@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4512 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-08-09 08:49:48 +00:00
parent a3b7406219
commit 2ab209ef14
9 changed files with 8 additions and 18 deletions

View File

@ -10,7 +10,7 @@
#include <string> #include <string>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
#include "webrtc_cng.h" #include "webrtc_cng.h"
namespace webrtc { namespace webrtc {

View File

@ -16,8 +16,8 @@
#include "common_types.h" #include "common_types.h"
#include "SpatialAudio.h" #include "SpatialAudio.h"
#include "trace.h" #include "trace.h"
#include "testsupport/fileutils.h"
#include "utility.h" #include "utility.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc { namespace webrtc {

View File

@ -18,8 +18,8 @@
#include "common_types.h" #include "common_types.h"
#include "engine_configurations.h" #include "engine_configurations.h"
#include "trace.h" #include "trace.h"
#include "testsupport/fileutils.h"
#include "utility.h" #include "utility.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc { namespace webrtc {

View File

@ -23,8 +23,8 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "PCMFile.h" #include "PCMFile.h"
#include "trace.h" #include "trace.h"
#include "testsupport/fileutils.h"
#include "utility.h" #include "utility.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc { namespace webrtc {

View File

@ -14,8 +14,8 @@
#include "PCMFile.h" #include "PCMFile.h"
#include "module_common_types.h" #include "module_common_types.h"
#include "scoped_ptr.h" #include "scoped_ptr.h"
#include "testsupport/fileutils.h"
#include "typedefs.h" #include "typedefs.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/test/testsupport/gtest_disable.h"
namespace webrtc { namespace webrtc {

View File

@ -16,7 +16,6 @@
#include <iostream> #include <iostream>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "testsupport/fileutils.h"
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
@ -25,6 +24,7 @@
#include "webrtc/modules/audio_coding/main/test/utility.h" #include "webrtc/modules/audio_coding/main/test/utility.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/test/testsupport/gtest_disable.h"
namespace webrtc { namespace webrtc {

View File

@ -9,11 +9,11 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "testsupport/fileutils.h"
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
#include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/test/testsupport/gtest_disable.h"
namespace webrtc { namespace webrtc {

View File

@ -22,13 +22,13 @@
#include <vector> #include <vector>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "testsupport/fileutils.h"
#include "webrtc/modules/audio_coding/neteq/interface/webrtc_neteq_help_macros.h" #include "webrtc/modules/audio_coding/neteq/interface/webrtc_neteq_help_macros.h"
#include "webrtc/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h" #include "webrtc/modules/audio_coding/neteq/interface/webrtc_neteq_internal.h"
#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_CodecClass.h" #include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_CodecClass.h"
#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.h" #include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.h"
#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h" #include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

View File

@ -44,21 +44,11 @@
{ {
'target_name': 'test_support', 'target_name': 'test_support',
'type': 'static_library', 'type': 'static_library',
'include_dirs': [
# TODO(kjellander): Remove this by making all includes use full paths.
'.',
],
'dependencies': [ 'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'all_dependent_settings': {
'include_dirs': [
# TODO(kjellander): Remove this by making all includes use full paths.
'.',
],
},
'sources': [ 'sources': [
'test_suite.cc', 'test_suite.cc',
'test_suite.h', 'test_suite.h',