From f5ff67ca98871895fd70fcc5427691a231e7dda1 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 6 Dec 2017 16:31:18 +0100 Subject: [PATCH] Stop using public_deps in rtc_tools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8603 Change-Id: I8126971f80310ad077a1e536c022a296612f573a No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/30300 Reviewed-by: Edward Lemur Reviewed-by: Patrik Höglund Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#21162} --- rtc_tools/BUILD.gn | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index 8ab0951ac9..49e4568c86 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -13,32 +13,32 @@ group("rtc_tools") { # This target shall build all targets in tools/. testonly = true - public_deps = [ + deps = [ ":command_line_parser", ":frame_analyzer", ":video_quality_analysis", ] if (!build_with_chromium) { - public_deps += [ + deps += [ ":frame_editor", ":psnr_ssim_analyzer", ":rgba_to_i420_converter", ] if (rtc_include_internal_audio_device) { - public_deps += [ ":force_mic_volume_max" ] + deps += [ ":force_mic_volume_max" ] } if (rtc_enable_protobuf) { - public_deps += [ ":chart_proto" ] + deps += [ ":chart_proto" ] } } if (rtc_include_tests) { - public_deps += [ + deps += [ ":activity_metric", ":tools_unittests", ] if (rtc_enable_protobuf) { - public_deps += [ + deps += [ ":event_log_visualizer", ":rtp_analyzer", "network_tester", @@ -72,6 +72,7 @@ rtc_static_library("video_quality_analysis") { # this dependency has to be added here so the linker can find the # symbols it needs. "../api:optional", + "../common_video", ] } @@ -221,6 +222,7 @@ if (!build_with_chromium) { } defines = [ "ENABLE_RTC_EVENT_LOG" ] deps = [ + ":chart_proto", "../call:call_interfaces", "../call:video_stream_api", "../logging:rtc_event_log_impl", @@ -240,10 +242,6 @@ if (!build_with_chromium) { "../system_wrappers:system_wrappers_default", "//build/config:exe_and_shlib_deps", ] - public_deps = [ - ":chart_proto", - "../logging:rtc_event_log_parser", - ] } } } @@ -264,6 +262,7 @@ if (rtc_include_tests) { defines = [ "ENABLE_RTC_EVENT_LOG" ] deps = [ ":event_log_visualizer_utils", + "../logging:rtc_event_log_parser", "../rtc_base:rtc_base_approved", "../test:field_trial", "../test:test_support",