From aaecefe72a10ccdc45299ebf301c8e08a192f1e6 Mon Sep 17 00:00:00 2001 From: "harryjin@google.com" Date: Thu, 7 Aug 2014 00:22:57 +0000 Subject: [PATCH] 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 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/all.gyp b/all.gyp index 19c5dea30..4830c5425 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"', {