From 14d7700d00985074b147107cd11cb2bffad74c68 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Fri, 17 May 2013 11:52:08 +0000 Subject: [PATCH] Moved command line parsing to internal tools and moved back the mic volume thingie. BUG= R=henrika@webrtc.org, kjellander@webrtc.org, stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1491004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4054 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc.gyp | 1 - .../modules/video_coding/codecs/vp8/vp8.gyp | 2 +- ..._mic_volume_max.gyp => internal_tools.gyp} | 19 +++++++------ webrtc/tools/tools.gyp | 28 ++++++++++--------- 4 files changed, 26 insertions(+), 24 deletions(-) rename webrtc/tools/{force_mic_volume_max.gyp => internal_tools.gyp} (55%) diff --git a/webrtc.gyp b/webrtc.gyp index c682b59739..6d2e04f09e 100644 --- a/webrtc.gyp +++ b/webrtc.gyp @@ -34,7 +34,6 @@ '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/modules/video_coding/codecs/vp8/vp8.gyp b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp index 73d3e98f7a..bd86390a46 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp +++ b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp @@ -108,7 +108,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', - '<(webrtc_root)/tools/tools.gyp:command_line_parser', + '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser', ], 'sources': [ 'vp8_sequence_coder.cc', diff --git a/webrtc/tools/force_mic_volume_max.gyp b/webrtc/tools/internal_tools.gyp similarity index 55% rename from webrtc/tools/force_mic_volume_max.gyp rename to webrtc/tools/internal_tools.gyp index e29c68b209..9d5fe25dac 100644 --- a/webrtc/tools/force_mic_volume_max.gyp +++ b/webrtc/tools/internal_tools.gyp @@ -1,24 +1,25 @@ -# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. + # 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. + +# This file is used for internal tools used by the WebRTC code only. + { 'includes': [ '../build/common.gypi', ], 'targets': [ { - 'target_name': 'force_mic_volume_max', - 'type': 'executable', - 'dependencies': [ - '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core', - ], + 'target_name': 'command_line_parser', + 'type': 'static_library', 'sources': [ - 'force_mic_volume_max/force_mic_volume_max.cc', + 'simple_command_line_parser.h', + 'simple_command_line_parser.cc', ], - }, # force_mic_volume_max - ] + }, # command_line_parser + ], } \ No newline at end of file diff --git a/webrtc/tools/tools.gyp b/webrtc/tools/tools.gyp index 3a6787e2bd..6f54150e6b 100644 --- a/webrtc/tools/tools.gyp +++ b/webrtc/tools/tools.gyp @@ -11,14 +11,6 @@ '../build/common.gypi', ], 'targets': [ - { - 'target_name': 'command_line_parser', - 'type': 'static_library', - 'sources': [ - 'simple_command_line_parser.h', - 'simple_command_line_parser.cc', - ], - }, # command_line_parser { 'target_name': 'video_quality_analysis', 'type': 'static_library', @@ -45,7 +37,7 @@ 'target_name': 'frame_analyzer', 'type': 'executable', 'dependencies': [ - 'command_line_parser', + '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser', 'video_quality_analysis', ], 'sources': [ @@ -56,7 +48,7 @@ 'target_name': 'psnr_ssim_analyzer', 'type': 'executable', 'dependencies': [ - 'command_line_parser', + '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser', 'video_quality_analysis', ], 'sources': [ @@ -67,7 +59,7 @@ 'target_name': 'rgba_to_i420_converter', 'type': 'executable', 'dependencies': [ - 'command_line_parser', + '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser', '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv', ], 'sources': [ @@ -95,13 +87,23 @@ 'target_name': 'frame_editor', 'type': 'executable', 'dependencies': [ - 'command_line_parser', + '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser', 'frame_editing_lib', ], 'sources': [ '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', { @@ -110,8 +112,8 @@ 'target_name': 'tools_unittests', 'type': 'executable', 'dependencies': [ - 'command_line_parser', 'frame_editing_lib', + '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser', '<(webrtc_root)/test/test.gyp:test_support_main', '<(DEPTH)/testing/gtest.gyp:gtest', ],