From ebe62408b5f175d32f80c8fc0aa2bdccc6bba4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Fri, 24 Nov 2017 13:51:52 +0100 Subject: [PATCH] Fix circular dependency in rtc_event_log. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:6828 Change-Id: Ief948b6799455cfda6cb89e2e632f5fd42df0881 Reviewed-on: https://webrtc-review.googlesource.com/25840 Reviewed-by: Henrik Lundin Commit-Queue: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#20928} --- modules/audio_coding/BUILD.gn | 5 +---- modules/audio_coding/neteq/tools/rtc_event_log_source.cc | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index 04683d1608..91bde7f87f 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -1161,10 +1161,6 @@ if (rtc_enable_protobuf) { rtc_static_library("rtc_event_log_source") { testonly = true - # TODO(kjellander): Remove (bugs.webrtc.org/6828) - # Needs call.h to be moved to webrtc/api first. - check_includes = false - sources = [ "neteq/tools/rtc_event_log_source.cc", "neteq/tools/rtc_event_log_source.h", @@ -1176,6 +1172,7 @@ if (rtc_enable_protobuf) { } deps = [ + ":neteq_tools_minimal", "../../logging:rtc_event_log_parser", "../../rtc_base:rtc_base_approved", ] diff --git a/modules/audio_coding/neteq/tools/rtc_event_log_source.cc b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc index e2c9ac9371..d6224ffa0e 100644 --- a/modules/audio_coding/neteq/tools/rtc_event_log_source.cc +++ b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc @@ -15,7 +15,6 @@ #include #include -#include "call/call.h" #include "modules/audio_coding/neteq/tools/packet.h" #include "modules/rtp_rtcp/include/rtp_header_parser.h" #include "rtc_base/checks.h"