From e24557f51eec61de1bf40afc7b0a284474c5785d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 19 Sep 2019 11:36:35 +0200 Subject: [PATCH] Declare api:libjingle_peerconnection_api dependency on media:media_base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Deletes one of the two // nogncheck comments in peerconnection_interface.h. Bug: webrtc:8733 Change-Id: I7cda4957206c4c5f36261517718b526734bad68a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150798 Reviewed-by: Mirko Bonadei Reviewed-by: Patrik Höglund Reviewed-by: Benjamin Wright Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#29247} --- api/BUILD.gn | 1 + api/peer_connection_interface.h | 2 +- modules/rtp_rtcp/BUILD.gn | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/BUILD.gn b/api/BUILD.gn index 7cc56b7460..f6be2c2b36 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -205,6 +205,7 @@ rtc_static_library("libjingle_peerconnection_api") { # targets like pnacl. API should not depend on anything outside of this # file, really. All these should arguably go away in time. "..:webrtc_common", + "../media:rtc_media_base", "../media:rtc_media_config", "../modules/audio_processing:audio_processing_statistics", "../rtc_base", diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h index 82f687c755..f2cc696e62 100644 --- a/api/peer_connection_interface.h +++ b/api/peer_connection_interface.h @@ -103,10 +103,10 @@ #include "api/transport/network_control.h" #include "api/turn_customizer.h" #include "media/base/media_config.h" +#include "media/base/media_engine.h" // TODO(bugs.webrtc.org/7447): We plan to provide a way to let applications // inject a PacketSocketFactory and/or NetworkManager, and not expose // PortAllocator in the PeerConnection api. -#include "media/base/media_engine.h" // nogncheck #include "p2p/base/port_allocator.h" // nogncheck #include "rtc_base/network.h" #include "rtc_base/rtc_certificate.h" diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index 06ea96dfc9..a66ada7f74 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -102,7 +102,6 @@ rtc_source_set("rtp_rtcp_format") { "..:module_api_public", "../../api:array_view", "../../api:function_view", - "../../api:libjingle_peerconnection_api", "../../api:rtp_headers", "../../api:rtp_parameters", "../../api/audio_codecs:audio_codecs_api",