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

Revert 6380 "Replace libjingle_root with talk_root variable."

Browse Source 
It turns out this doesn't fix the problem we're trying to solve...

> Replace libjingle_root with talk_root variable.
> 
> This CL is similar to https://review.webrtc.org/9019004/
> It is needed in order to be able to build with different
> copies of libjingle. Having the libjingle_root variable didn't
> make this possible, since relative paths in the .isolate files
> ended up at the wrong directory level and .isolate files doesn't
> support all the normal GYP variables like <(DEPTH).
> 
> BUG=chromium:343106
> TEST=trybots passing compile step with clobber.
> R=tommi@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/15709004

TBR=kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6384 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-06-10 10:13:38 +00:00
parent 3eb2c2f4c3
commit 1014101470
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
all.gyp
View File

@ -8,7 +8,7 @@
{
'variables': {
'talk_root%': '<(DEPTH)/talk',
'libjingle_root%': '<(DEPTH)',
},
'targets': [
{
@ -17,9 +17,9 @@
'dependencies': [
'third_party/openmax_dl/dl/dl.gyp:*',
'webrtc/webrtc.gyp:*',
'<(talk_root)/libjingle.gyp:*',
'<(talk_root)/libjingle_examples.gyp:*',
'<(talk_root)/libjingle_tests.gyp:*',
'<(libjingle_root)/talk/libjingle.gyp:*',
'<(libjingle_root)/talk/libjingle_examples.gyp:*',
'<(libjingle_root)/talk/libjingle_tests.gyp:*',
],
'conditions': [
['OS=="android"', {

6
talk/build/common.gypi
View File

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