From 0be1f234b6c04fae199b4a05f83ee65a00928a72 Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Sat, 15 Sep 2012 02:50:52 +0000
Subject: [PATCH] Add merge_libs_dependencies and remove
 voice_engine_dependencies.

TBR=wu,turaj
TESTED=trybots
Review URL: https://webrtc-codereview.appspot.com/798006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2777 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/build/merge_libs.gyp                | 11 +++++++---
 src/voice_engine/voice_engine_core.gypi | 27 ++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/build/merge_libs.gyp b/src/build/merge_libs.gyp
index d24718918a..c31b259de1 100644
--- a/src/build/merge_libs.gyp
+++ b/src/build/merge_libs.gyp
@@ -7,15 +7,20 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'includes': [ 'common.gypi', ],
+  'includes': ['common.gypi',],
+  'variables': {
+    'merge_libs_dependencies': [
+      '../video_engine/video_engine.gyp:video_engine_core',
+    ],
+  },
   'targets': [
     {
       'target_name': 'no_op',
       'type': 'executable',
       'dependencies': [
-        '../video_engine/video_engine.gyp:video_engine_core',
+        '<@(merge_libs_dependencies)',
       ],
-      'sources': [ 'no_op.cc', ],
+      'sources': ['no_op.cc',],
     },
     {
       'target_name': 'merged_lib',
diff --git a/src/voice_engine/voice_engine_core.gypi b/src/voice_engine/voice_engine_core.gypi
index 354993a3d3..880d5aadc0 100644
--- a/src/voice_engine/voice_engine_core.gypi
+++ b/src/voice_engine/voice_engine_core.gypi
@@ -7,27 +7,22 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'variables': {
-    'voice_engine_dependencies': [
-      '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
-      '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
-      '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
-      '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
-      '<(webrtc_root)/modules/modules.gyp:audio_device',
-      '<(webrtc_root)/modules/modules.gyp:audio_processing',
-      '<(webrtc_root)/modules/modules.gyp:media_file',
-      '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
-      '<(webrtc_root)/modules/modules.gyp:udp_transport',
-      '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
-      '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-    ],
-  },
   'targets': [
     {
       'target_name': 'voice_engine_core',
       'type': '<(library)',
       'dependencies': [
-        '<@(voice_engine_dependencies)',
+        '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
+        '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
+        '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
+        '<(webrtc_root)/modules/modules.gyp:audio_device',
+        '<(webrtc_root)/modules/modules.gyp:audio_processing',
+        '<(webrtc_root)/modules/modules.gyp:media_file',
+        '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
+        '<(webrtc_root)/modules/modules.gyp:udp_transport',
+        '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
+        '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [
         'include',