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

Remove libjingle_root GYP variable

Browse Source 
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
This commit is contained in:
kjellander@webrtc.org 2015-03-06 08:03:16 +00:00
parent e9217b4bdb
commit e41ec818a7
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
all.gyp
View File

@ -8,10 +8,8 @@
{ {
'variables': { 'variables': {
'libjingle_root%': '<(DEPTH)',
'include_tests%': 1, 'include_tests%': 1,
'webrtc_root_additional_dependencies': [ 'webrtc_root_additional_dependencies': [],
],
}, },
'targets': [ 'targets': [
{ {
@ -19,8 +17,8 @@
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'webrtc/webrtc.gyp:*', 'webrtc/webrtc.gyp:*',
'<(libjingle_root)/talk/libjingle.gyp:*', 'talk/libjingle.gyp:*',
'<(libjingle_root)/talk/libjingle_examples.gyp:*', 'talk/libjingle_examples.gyp:*',
'<@(webrtc_root_additional_dependencies)', '<@(webrtc_root_additional_dependencies)',
], ],
'conditions': [ 'conditions': [
@ -31,7 +29,7 @@
}], }],
['include_tests==1', { ['include_tests==1', {
'dependencies': [ 'dependencies': [
'<(libjingle_root)/talk/libjingle_tests.gyp:*', 'talk/libjingle_tests.gyp:*',
], ],
}], }],
], ],

4
talk/build/common.gypi
View File

@ -30,9 +30,7 @@
{ {
'variables': { 'variables': {
'webrtc_root%': '<(DEPTH)/webrtc', 'webrtc_root%': '<(DEPTH)/webrtc',
# TODO(ronghuawu): Chromium build will need a different libjingle_root.
'libjingle_tests_additional_deps%': [], 'libjingle_tests_additional_deps%': [],
'libjingle_root%': '<(DEPTH)',
# TODO(ronghuawu): For now, disable the Chrome plugins, which causes a # TODO(ronghuawu): For now, disable the Chrome plugins, which causes a
# flood of chromium-style warnings. # flood of chromium-style warnings.
'clang_use_chrome_plugins%': 0, 'clang_use_chrome_plugins%': 0,
@ -45,8 +43,8 @@
}, },
'target_defaults': { 'target_defaults': {
'include_dirs': [ 'include_dirs': [
'<(libjingle_root)',
'<(DEPTH)', '<(DEPTH)',
'../..',
'../../third_party', '../../third_party',
'../../third_party/webrtc', '../../third_party/webrtc',
'../../webrtc', '../../webrtc',