From f2ec814e0f1800ce3f33206d9993fc997a0c9566 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 30 Jan 2015 14:54:36 +0000 Subject: [PATCH] Move use of DEPTH into build_with_chromium==1. 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 --- webrtc/build/common.gypi | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 4fe255a0a7..4a9e7b87a2 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -162,11 +162,6 @@ ], # conditions }, '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': [ ['restrict_webrtc_logging==1', { 'defines': ['WEBRTC_RESTRICT_LOGGING',], @@ -198,14 +193,21 @@ 'LOGGING_INSIDE_WEBRTC', ], 'include_dirs': [ - # overrides must be included first as that is the mechanism for - # selecting the override headers in Chromium. + # Include the top-level directory when building in Chrome, so we can + # 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', - # Allow includes to be prefixed with webrtc/ in case it is not an - # immediate subdirectory of <(DEPTH). + # The WebRTC root is needed to allow includes in the WebRTC code base + # to be prefixed with webrtc/. '../..', ], }, { + # Include the top-level dir so the WebRTC code can use full paths. + 'include_dirs': [ + '../..', + ], 'conditions': [ ['os_posix==1', { 'configurations': {