From 5c1948dfaf6e97bde597cc6bc9b7b34c79df2aba Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Thu, 16 May 2013 13:59:19 +0000 Subject: [PATCH] Moved force_volume_max to its own gyp file to avoid a circular dependency. BUG= TBR=tlegrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1489004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4046 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc.gyp | 1 + webrtc/tools/force_mic_volume_max.gyp | 24 ++++++++++++++++++++++++ webrtc/tools/tools.gyp | 10 ---------- 3 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 webrtc/tools/force_mic_volume_max.gyp diff --git a/webrtc.gyp b/webrtc.gyp index 6d2e04f09e..c682b59739 100644 --- a/webrtc.gyp +++ b/webrtc.gyp @@ -34,6 +34,7 @@ 'webrtc/test/metrics.gyp:*', 'webrtc/test/test.gyp:*', 'webrtc/tools/tools.gyp:*', + 'webrtc/tools/force_mic_volume_max.gyp:*', 'tools/e2e_quality/e2e_quality.gyp:*', ], }], diff --git a/webrtc/tools/force_mic_volume_max.gyp b/webrtc/tools/force_mic_volume_max.gyp new file mode 100644 index 0000000000..e29c68b209 --- /dev/null +++ b/webrtc/tools/force_mic_volume_max.gyp @@ -0,0 +1,24 @@ +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. +{ + 'includes': [ + '../build/common.gypi', + ], + 'targets': [ + { + 'target_name': 'force_mic_volume_max', + 'type': 'executable', + 'dependencies': [ + '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core', + ], + 'sources': [ + 'force_mic_volume_max/force_mic_volume_max.cc', + ], + }, # force_mic_volume_max + ] +} \ No newline at end of file diff --git a/webrtc/tools/tools.gyp b/webrtc/tools/tools.gyp index a16ad51851..3a6787e2bd 100644 --- a/webrtc/tools/tools.gyp +++ b/webrtc/tools/tools.gyp @@ -102,16 +102,6 @@ 'frame_editing/frame_editing.cc', ], }, # frame_editing - { - 'target_name': 'force_mic_volume_max', - 'type': 'executable', - 'dependencies': [ - '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core', - ], - 'sources': [ - 'force_mic_volume_max/force_mic_volume_max.cc', - ], - }, # force_mic_volume_max ], 'conditions': [ ['include_tests==1', {