From e41ec818a7fedd9d88dc8018b711ebcdab0afffd Mon Sep 17 00:00:00 2001
From: "kjellander@webrtc.org" <kjellander@webrtc.org>
Date: Fri, 6 Mar 2015 08:03:16 +0000
Subject: [PATCH] Remove libjingle_root GYP variable
It is no longer needed.
R=andrew@webrtc.org, perkj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/44449004
Cr-Commit-Position: refs/heads/master@{#8627}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8627 4adac7df-926f-26a2-2b94-8c16560cd09d
---
all.gyp | 10 ++++------
talk/build/common.gypi | 4 +---
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/all.gyp b/all.gyp
index 2280c036d..702e7d07e 100644
--- a/all.gyp
+++ b/all.gyp
@@ -8,10 +8,8 @@
{
'variables': {
- 'libjingle_root%': '<(DEPTH)',
'include_tests%': 1,
- 'webrtc_root_additional_dependencies': [
- ],
+ 'webrtc_root_additional_dependencies': [],
},
'targets': [
{
@@ -19,8 +17,8 @@
'type': 'none',
'dependencies': [
'webrtc/webrtc.gyp:*',
- '<(libjingle_root)/talk/libjingle.gyp:*',
- '<(libjingle_root)/talk/libjingle_examples.gyp:*',
+ 'talk/libjingle.gyp:*',
+ 'talk/libjingle_examples.gyp:*',
'<@(webrtc_root_additional_dependencies)',
],
'conditions': [
@@ -31,7 +29,7 @@
}],
['include_tests==1', {
'dependencies': [
- '<(libjingle_root)/talk/libjingle_tests.gyp:*',
+ 'talk/libjingle_tests.gyp:*',
],
}],
],
diff --git a/talk/build/common.gypi b/talk/build/common.gypi
index 6cde99fa2..093933cdc 100644
--- a/talk/build/common.gypi
+++ b/talk/build/common.gypi
@@ -30,9 +30,7 @@
{
'variables': {
'webrtc_root%': '<(DEPTH)/webrtc',
- # TODO(ronghuawu): Chromium build will need a different libjingle_root.
'libjingle_tests_additional_deps%': [],
- 'libjingle_root%': '<(DEPTH)',
# TODO(ronghuawu): For now, disable the Chrome plugins, which causes a
# flood of chromium-style warnings.
'clang_use_chrome_plugins%': 0,
@@ -45,8 +43,8 @@
},
'target_defaults': {
'include_dirs': [
- '<(libjingle_root)',
'<(DEPTH)',
+ '../..',
'../../third_party',
'../../third_party/webrtc',
'../../webrtc',