From 03d6f2f7ff6e2725844f1ecd47654744feac4f31 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 5 Dec 2017 15:33:16 +0100 Subject: [PATCH] Stop using public_deps in modules/audio_mixer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TBR=phoglund@webrtc.org Bug: webrtc:8603 Change-Id: I74c01d5a0243c96dca504b2d696092ea35c36aa3 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/29860 Reviewed-by: Edward Lemur Reviewed-by: Patrik Höglund Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#21105} --- call/BUILD.gn | 1 + modules/audio_mixer/BUILD.gn | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/call/BUILD.gn b/call/BUILD.gn index 280d19e3c6..cd26a11104 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -202,6 +202,7 @@ if (rtc_include_tests) { "../logging:rtc_event_log_api", "../modules/audio_device:mock_audio_device", "../modules/audio_mixer", + "../modules/audio_mixer:audio_mixer_impl", "../modules/bitrate_controller", "../modules/congestion_controller", "../modules/congestion_controller:mock_congestion_controller", diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn index 79ab38ddcf..f2ad1601ab 100644 --- a/modules/audio_mixer/BUILD.gn +++ b/modules/audio_mixer/BUILD.gn @@ -9,7 +9,7 @@ import("../../webrtc.gni") group("audio_mixer") { - public_deps = [ + deps = [ ":audio_frame_manipulator", ":audio_mixer_impl", ] @@ -32,15 +32,12 @@ rtc_static_library("audio_mixer_impl") { "frame_combiner.h", ] - public_deps = [ - "../../api:audio_mixer_api", - ] - deps = [ ":audio_frame_manipulator", "..:module_api", "../..:webrtc_common", "../../api:array_view", + "../../api:audio_mixer_api", "../../audio/utility:audio_frame_operations", "../../rtc_base:rtc_base_approved", "../../system_wrappers",