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

Revert 6839 "Allow root build dependencies to be overridden."

Browse Source 
> Allow root build dependencies to be overridden.
> 
> RISK=P2
> TESTED=manual
> R=andrew@webrtc.org, thorcarpenter@google.com
> 
> Review URL: https://webrtc-codereview.appspot.com/19009004

TBR=harryjin@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6840 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
harryjin@google.com 2014-08-07 00:22:57 +00:00
parent e34abfb8e7
commit aaecefe72a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
all.gyp
View File

@ -10,19 +10,16 @@
'variables': { 'variables': {
'libjingle_root%': '<(DEPTH)', 'libjingle_root%': '<(DEPTH)',
'include_tests%': 1, 'include_tests%': 1,
'webrtc_root_all_dependencies': [
'third_party/openmax_dl/dl/dl.gyp:*',
'webrtc/webrtc.gyp:*',
'<(DEPTH)/talk/libjingle.gyp:*',
'<(DEPTH)/talk/libjingle_examples.gyp:*',
],
}, },
'targets': [ 'targets': [
{ {
'target_name': 'All', 'target_name': 'All',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'<@(webrtc_root_all_dependencies)', 'third_party/openmax_dl/dl/dl.gyp:*',
'webrtc/webrtc.gyp:*',
'<(libjingle_root)/talk/libjingle.gyp:*',
'<(libjingle_root)/talk/libjingle_examples.gyp:*',
], ],
'conditions': [ 'conditions': [
['OS=="android"', { ['OS=="android"', {