generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2013-11-11 10:20:27 +00:00
parent 6e908b3adf
commit 57eb858698
23 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/build/common.gypi
View File

@ -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).
'../..',

2
webrtc/modules/audio_coding/codecs/cng/cng.gypi
View File

@ -16,10 +16,12 @@
],
'include_dirs': [
'include',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'include',
'<(webrtc_root)',
],
},
'sources': [

2
webrtc/modules/audio_coding/codecs/g711/g711.gypi
View File

@ -13,10 +13,12 @@
'type': 'static_library',
'include_dirs': [
'include',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'include',
'<(webrtc_root)',
],
},
'sources': [

2
webrtc/modules/audio_coding/codecs/g722/g722.gypi
View File

@ -12,10 +12,12 @@
'type': 'static_library',
'include_dirs': [
'include',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'include',
'<(webrtc_root)',
],
},
'sources': [

2
webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi
View File

@ -16,10 +16,12 @@
],
'include_dirs': [
'interface',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'interface',
'<(webrtc_root)',
],
},
'sources': [

5
webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
View File

@ -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',

3
webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
View File

@ -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',

1
webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi
View File

@ -19,6 +19,7 @@
'include_dirs': [
'./fix/test',
'./fix/interface',
'<(webrtc_root)',
],
'sources': [
'./fix/test/kenny.cc',

2
webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi
View File

@ -16,10 +16,12 @@
],
'include_dirs': [
'../interface',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'<(webrtc_root)',
],
},
'sources': [

3
webrtc/modules/audio_coding/codecs/opus/opus.gypi
View File

@ -23,6 +23,9 @@
],
}],
],
'include_dirs': [
'<(webrtc_root)',
],
'sources': [
'interface/opus_interface.h',
'opus_interface.c',

2
webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
View File

@ -13,10 +13,12 @@
'type': 'static_library',
'include_dirs': [
'include',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'include',
'<(webrtc_root)',
],
},
'sources': [

2
webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
View File

@ -21,11 +21,13 @@
'include_dirs': [
'../interface',
'../../../interface',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'../../../interface',
'<(webrtc_root)',
],
},
'sources': [

2
webrtc/modules/audio_coding/main/source/audio_coding_module.gypi
View File

@ -42,11 +42,13 @@
'include_dirs': [
'../interface',
'../../../interface',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'../../../interface',
'<(webrtc_root)',
],
},
'sources': [

2
webrtc/modules/audio_coding/neteq/neteq.gypi
View File

@ -21,10 +21,12 @@
],
'include_dirs': [
'interface',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'interface',
'<(webrtc_root)',
],
},
'sources': [

2
webrtc/modules/audio_coding/neteq4/neteq.gypi
View File

@ -39,10 +39,12 @@
],
'include_dirs': [
'interface',
'<(webrtc_root)',
],
'direct_dependent_settings': {
'include_dirs': [
'interface',
'<(webrtc_root)',
],
},
'sources': [

3
webrtc/modules/audio_coding/neteq4/neteq_tests.gypi
View File

@ -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',

2
webrtc/modules/interface/module.h
View File

@ -13,7 +13,7 @@
#include <assert.h>
#include "typedefs.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/rtp_rtcp/source/H264/h264_information.h
View File

@ -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

2
webrtc/modules/rtp_rtcp/source/H264/rtp_sender_h264.h
View File

@ -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"

2
webrtc/modules/video_coding/main/test/jitter_estimate_test.h
View File

@ -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>

2
webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
View File

@ -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"

4
webrtc/modules/video_render/mac/video_render_nsopengl.mm
View File

@ -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 {

2
webrtc/system_wrappers/interface/cpu_features_wrapper.h
View File

@ -15,7 +15,7 @@
extern "C" {
#endif
#include <typedefs.h>
#include "webrtc/typedefs.h"
// List of features in x86.
typedef enum {