commit aaecefe72a10ccdc45299ebf301c8e08a192f1e6
author harryjin@google.com <harryjin@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Aug 07 00:22:57 2014 +0000
committer harryjin@google.com <harryjin@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Aug 07 00:22:57 2014 +0000
tree 9670a5dcc457f37585a6cb78e5ed29fafd3950c2
parent e34abfb8e789e3bdfb63ad08765a57a7baae6a50

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

> 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

all.gyp

diff --git a/all.gyp b/all.gyp
index 19c5dea..4830c54 100644
--- a/all.gyp
+++ b/all.gyp
@@ -10,19 +10,16 @@
   'variables': {
     'libjingle_root%': '<(DEPTH)',
     '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': [
     {
       'target_name': 'All',
       'type': 'none',
       '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': [
         ['OS=="android"', {