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

Move use of DEPTH into build_with_chromium==1.

Browse Source 
For build_with_chromium==1 the includes will be the same.
For build_with_chromium==0 the <(DEPTH) variable is replaced by ../..
which should be the same in all common use cases.

This change makes the include paths for all GYP targets
more similar to the setup in the
direct_dependent_settings section further down.

BUG=4185
TESTED=Trybots + build in Chromium with third_party/webrtc patched with this CL.
R=tommi@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8219}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8219 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2015-01-30 14:54:36 +00:00
parent f88bee6d88
commit f2ec814e0f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/build/common.gypi
View File

@ -162,11 +162,6 @@
], # conditions ], # conditions
}, },
'target_defaults': { 'target_defaults': {
'include_dirs': [
# To include the top-level directory when building in Chrome, so we can
# use full paths (e.g. headers inside testing/ or third_party/).
'<(DEPTH)',
],
'conditions': [ 'conditions': [
['restrict_webrtc_logging==1', { ['restrict_webrtc_logging==1', {
'defines': ['WEBRTC_RESTRICT_LOGGING',], 'defines': ['WEBRTC_RESTRICT_LOGGING',],
@ -198,14 +193,21 @@
'LOGGING_INSIDE_WEBRTC', 'LOGGING_INSIDE_WEBRTC',
], ],
'include_dirs': [ 'include_dirs': [
# overrides must be included first as that is the mechanism for # Include the top-level directory when building in Chrome, so we can
# selecting the override headers in Chromium. # use full paths (e.g. headers inside testing/ or third_party/).
'<(DEPTH)',
# The overrides must be included before the WebRTC root as that's the
# mechanism for selecting the override headers in Chromium.
'../overrides', '../overrides',
# Allow includes to be prefixed with webrtc/ in case it is not an # The WebRTC root is needed to allow includes in the WebRTC code base
# immediate subdirectory of <(DEPTH). # to be prefixed with webrtc/.
'../..', '../..',
], ],
}, { }, {
# Include the top-level dir so the WebRTC code can use full paths.
'include_dirs': [
'../..',
],
'conditions': [ 'conditions': [
['os_posix==1', { ['os_posix==1', {
'configurations': { 'configurations': {