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/webrtc@4512 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/audio_coding/codecs/cng/cng_unittest.cc b/modules/audio_coding/codecs/cng/cng_unittest.cc
index 5d43b7d..d363cb2 100644
--- a/modules/audio_coding/codecs/cng/cng_unittest.cc
+++ b/modules/audio_coding/codecs/cng/cng_unittest.cc
@@ -10,7 +10,7 @@
#include <string>
#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc_cng.h"
namespace webrtc {
diff --git a/modules/audio_coding/main/test/SpatialAudio.cc b/modules/audio_coding/main/test/SpatialAudio.cc
index e4a19cf..57417e3 100644
--- a/modules/audio_coding/main/test/SpatialAudio.cc
+++ b/modules/audio_coding/main/test/SpatialAudio.cc
@@ -16,8 +16,8 @@
#include "common_types.h"
#include "SpatialAudio.h"
#include "trace.h"
-#include "testsupport/fileutils.h"
#include "utility.h"
+#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/main/test/TestFEC.cc b/modules/audio_coding/main/test/TestFEC.cc
index 66c9441..acbc2f4 100644
--- a/modules/audio_coding/main/test/TestFEC.cc
+++ b/modules/audio_coding/main/test/TestFEC.cc
@@ -18,8 +18,8 @@
#include "common_types.h"
#include "engine_configurations.h"
#include "trace.h"
-#include "testsupport/fileutils.h"
#include "utility.h"
+#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/main/test/TwoWayCommunication.cc b/modules/audio_coding/main/test/TwoWayCommunication.cc
index 1bf8879..0bc94b7 100644
--- a/modules/audio_coding/main/test/TwoWayCommunication.cc
+++ b/modules/audio_coding/main/test/TwoWayCommunication.cc
@@ -23,8 +23,8 @@
#include "gtest/gtest.h"
#include "PCMFile.h"
#include "trace.h"
-#include "testsupport/fileutils.h"
#include "utility.h"
+#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/main/test/dual_stream_unittest.cc b/modules/audio_coding/main/test/dual_stream_unittest.cc
index 9130d97..7430ff8 100644
--- a/modules/audio_coding/main/test/dual_stream_unittest.cc
+++ b/modules/audio_coding/main/test/dual_stream_unittest.cc
@@ -14,8 +14,8 @@
#include "PCMFile.h"
#include "module_common_types.h"
#include "scoped_ptr.h"
-#include "testsupport/fileutils.h"
#include "typedefs.h"
+#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h"
namespace webrtc {
diff --git a/modules/audio_coding/main/test/initial_delay_unittest.cc b/modules/audio_coding/main/test/initial_delay_unittest.cc
index ea2e1ca..3a08dea 100644
--- a/modules/audio_coding/main/test/initial_delay_unittest.cc
+++ b/modules/audio_coding/main/test/initial_delay_unittest.cc
@@ -16,7 +16,6 @@
#include <iostream>
#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.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/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h"
namespace webrtc {
diff --git a/modules/audio_coding/main/test/target_delay_unittest.cc b/modules/audio_coding/main/test/target_delay_unittest.cc
index 159e0ca..e81cbac 100644
--- a/modules/audio_coding/main/test/target_delay_unittest.cc
+++ b/modules/audio_coding/main/test/target_delay_unittest.cc
@@ -9,11 +9,11 @@
*/
#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/system_wrappers/interface/sleep.h"
+#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/webrtc_neteq_unittest.cc b/modules/audio_coding/neteq/webrtc_neteq_unittest.cc
index 0f92c35..8f1c6ba 100644
--- a/modules/audio_coding/neteq/webrtc_neteq_unittest.cc
+++ b/modules/audio_coding/neteq/webrtc_neteq_unittest.cc
@@ -22,13 +22,13 @@
#include <vector>
#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_internal.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_RTPpacket.h"
#include "webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h"
+#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/test/test.gyp b/test/test.gyp
index c0340de..f49e313 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -44,21 +44,11 @@
{
'target_name': 'test_support',
'type': 'static_library',
- 'include_dirs': [
- # TODO(kjellander): Remove this by making all includes use full paths.
- '.',
- ],
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(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': [
'test_suite.cc',
'test_suite.h',