Remove ".." from include_dirs in build/common.

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

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

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

23 files changed, 43 insertions, 10 deletions

diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 23db40349a..73608a47bb 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -144,8 +144,6 @@
   },
   'target_defaults': {
     'include_dirs': [
-      # TODO(andrew): Remove '..' when we've added webrtc/ to include paths.
-      '..',
       # Allow includes to be prefixed with webrtc/ in case it is not an
       # immediate subdirectory of <(DEPTH).
       '../..',
diff --git a/webrtc/modules/audio_coding/codecs/cng/cng.gypi b/webrtc/modules/audio_coding/codecs/cng/cng.gypi
index 9bcde5918f..3ad7dd3201 100644
--- a/webrtc/modules/audio_coding/codecs/cng/cng.gypi
+++ b/webrtc/modules/audio_coding/codecs/cng/cng.gypi
@@ -16,10 +16,12 @@
       ],
       'include_dirs': [
         'include',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'include',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.gypi b/webrtc/modules/audio_coding/codecs/g711/g711.gypi
index 856e019740..c39b4af1d1 100644
--- a/webrtc/modules/audio_coding/codecs/g711/g711.gypi
+++ b/webrtc/modules/audio_coding/codecs/g711/g711.gypi
@@ -13,10 +13,12 @@
       'type': 'static_library',
       'include_dirs': [
         'include',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'include',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722.gypi b/webrtc/modules/audio_coding/codecs/g722/g722.gypi
index ba0dcb4f7f..5876f9feb6 100644
--- a/webrtc/modules/audio_coding/codecs/g722/g722.gypi
+++ b/webrtc/modules/audio_coding/codecs/g722/g722.gypi
@@ -12,10 +12,12 @@
       'type': 'static_library',
       'include_dirs': [
         'include',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'include',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi b/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi
index b07e3f1a47..ec3284f820 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi
+++ b/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi
@@ -16,10 +16,12 @@
       ],
       'include_dirs': [
         'interface',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'interface',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
index fd7bf2e960..ae0c18ab21 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
@@ -17,10 +17,12 @@
       ],
       'include_dirs': [
         '../interface',
+        '<(webrtc_root)'
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../interface',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
@@ -96,6 +98,9 @@
           'dependencies': [
             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
           ],
+          'include_dirs': [
+            '<(webrtc_root)',
+          ],
           'sources': [
             'entropy_coding_neon.c',
             'filterbanks_neon.S',
diff --git a/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi b/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
index 0130732af7..a43450e047 100644
--- a/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
@@ -19,6 +19,7 @@
         './main/test',
         './main/interface',
         './main/util',
+        '<(webrtc_root)',
       ],
       'sources': [
         './main/test/simpleKenny.c',
@@ -36,6 +37,7 @@
         './main/test',
         './main/interface',
         './main/util',
+        '<(webrtc_root)',
       ],
       'sources': [
         './main/test/ReleaseTest-API/ReleaseTest-API.cc',
@@ -54,6 +56,7 @@
         './main/interface',
         '../../../../common_audio/signal_processing/include',
         './main/util',
+        '<(webrtc_root)',
       ],
       'sources': [
         './main/test/SwitchingSampRate/SwitchingSampRate.cc',
diff --git a/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi b/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi
index 4bac161da1..419d302fd9 100644
--- a/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi
@@ -19,6 +19,7 @@
       'include_dirs': [
         './fix/test',
         './fix/interface',
+        '<(webrtc_root)',
       ],
       'sources': [
         './fix/test/kenny.cc',
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi b/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
index f6c33398e4..5ed6d448bb 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
@@ -16,10 +16,12 @@
       ],
       'include_dirs': [
         '../interface',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../interface',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
index b60cee549b..406870232b 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+++ b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
@@ -23,6 +23,9 @@
           ],
         }],
       ],
+      'include_dirs': [
+        '<(webrtc_root)',
+      ],
       'sources': [
         'interface/opus_interface.h',
         'opus_interface.c',
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
index 40bc2aabf6..bbb613e3ce 100644
--- a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
+++ b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
@@ -13,10 +13,12 @@
       'type': 'static_library',
       'include_dirs': [
         'include',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'include',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
index e86fbfc961..07541266de 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
@@ -21,11 +21,13 @@
       'include_dirs': [
         '../interface',
         '../../../interface',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../interface',
           '../../../interface',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi
index d7e07865d0..c6c10f6931 100644
--- a/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi
+++ b/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi
@@ -42,11 +42,13 @@
       'include_dirs': [
         '../interface',
         '../../../interface',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../interface',
           '../../../interface',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi
index 930613738e..27e5c37aab 100644
--- a/webrtc/modules/audio_coding/neteq/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq.gypi
@@ -21,10 +21,12 @@
       ],
       'include_dirs': [
         'interface',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'interface',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/neteq4/neteq.gypi b/webrtc/modules/audio_coding/neteq4/neteq.gypi
index 1a01a342d4..41fdb31ea6 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq4/neteq.gypi
@@ -39,10 +39,12 @@
       ],
       'include_dirs': [
         'interface',
+        '<(webrtc_root)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'interface',
+          '<(webrtc_root)',
         ],
       },
       'sources': [
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq4/neteq_tests.gypi
index faf7332f28..a2b9265613 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_tests.gypi
+++ b/webrtc/modules/audio_coding/neteq4/neteq_tests.gypi
@@ -56,6 +56,7 @@
       'include_dirs': [
         'interface',
         'test',
+        '<(webrtc_root)',
       ],
       'sources': [
         'test/RTPencode.cc',
@@ -172,6 +173,7 @@
         'include_dirs': [
           'interface',
           'test',
+          '<(webrtc_root)',
         ],
       },
       'defines': [
@@ -179,6 +181,7 @@
       'include_dirs': [
         'interface',
         'test',
+        '<(webrtc_root)',
       ],
       'sources': [
         'test/NETEQTEST_DummyRTPpacket.cc',
diff --git a/webrtc/modules/interface/module.h b/webrtc/modules/interface/module.h
index d9932add52..c177fd13e2 100644
--- a/webrtc/modules/interface/module.h
+++ b/webrtc/modules/interface/module.h
@@ -13,7 +13,7 @@
 
 #include <assert.h>
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/rtp_rtcp/source/H264/h264_information.h b/webrtc/modules/rtp_rtcp/source/H264/h264_information.h
index 42b0b88393..356a026ec6 100644
--- a/webrtc/modules/rtp_rtcp/source/H264/h264_information.h
+++ b/webrtc/modules/rtp_rtcp/source/H264/h264_information.h
@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_H264_H264_INFORMATION_H_
 
 #include "VideoCodecInformation.h"
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 enum
diff --git a/webrtc/modules/rtp_rtcp/source/H264/rtp_sender_h264.h b/webrtc/modules/rtp_rtcp/source/H264/rtp_sender_h264.h
index 92a4de6d8f..ea385d4596 100644
--- a/webrtc/modules/rtp_rtcp/source/H264/rtp_sender_h264.h
+++ b/webrtc/modules/rtp_rtcp/source/H264/rtp_sender_h264.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_H264_RTP_SENDER_H264_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_H264_RTP_SENDER_H264_H_
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 #include "ModuleRTPRTCPConfig.h"
 #include "rtp_rtcp_defines.h"
 #include "h264_information.h"
diff --git a/webrtc/modules/video_coding/main/test/jitter_estimate_test.h b/webrtc/modules/video_coding/main/test/jitter_estimate_test.h
index 086ec0c3d1..9318a49121 100644
--- a/webrtc/modules/video_coding/main/test/jitter_estimate_test.h
+++ b/webrtc/modules/video_coding/main/test/jitter_estimate_test.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_JITTER_ESTIMATE_TEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_TEST_JITTER_ESTIMATE_TEST_H_
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 #include "jitter_buffer.h"
 #include "jitter_estimator.h"
 #include <stdlib.h>
diff --git a/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
index 41c7049ae1..5c3d6fa781 100644
--- a/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
+++ b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "engine_configurations.h"
+#include "webrtc/engine_configurations.h"
 #if defined(COCOA_RENDERING)
 
 #import "cocoa_render_view.h"
diff --git a/webrtc/modules/video_render/mac/video_render_nsopengl.mm b/webrtc/modules/video_render/mac/video_render_nsopengl.mm
index 0659496261..2faca657bb 100644
--- a/webrtc/modules/video_render/mac/video_render_nsopengl.mm
+++ b/webrtc/modules/video_render/mac/video_render_nsopengl.mm
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "engine_configurations.h"
+#include "webrtc/engine_configurations.h"
 #if defined(COCOA_RENDERING)
 
 #include "video_render_nsopengl.h"
@@ -16,7 +16,7 @@
 #include "event_wrapper.h"
 #include "trace.h"
 #include "thread_wrapper.h"
-#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc {
 
diff --git a/webrtc/system_wrappers/interface/cpu_features_wrapper.h b/webrtc/system_wrappers/interface/cpu_features_wrapper.h
index 85152ba1f5..5697c49164 100644
--- a/webrtc/system_wrappers/interface/cpu_features_wrapper.h
+++ b/webrtc/system_wrappers/interface/cpu_features_wrapper.h
@@ -15,7 +15,7 @@
 extern "C" {
 #endif
 
-#include <typedefs.h>
+#include "webrtc/typedefs.h"
 
 // List of features in x86.
 typedef enum {