zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add temp peer_connection_interface include rtc_base/event.h

Browse Source 
This fixes the WebRTC roll in Chrome, which was failing because the
//third_party/nearby library was transively including Chromes //base/check
via WebRTC overrides by including
api/peer_connection_interface.h
which included api/proxy.h
which included rtc_base/event.h
which was overrided in webrtc_overrides.

This override contains an include to base/check.h.

Adding a temporary dependency on event.h fixes this for now. This can be
removed once https://crbug.com/1212611 is fixed.

Bug: None
Change-Id: Id372e0737664d4a94ade0f75ae5fcf21f3db929f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219630
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@google.com>
Cr-Commit-Position: refs/heads/master@{#34098}
This commit is contained in:
Evan Shrubsole
2021-05-24 12:59:56 +02:00
committed by WebRTC LUCI CQ
parent e6ee8fab7e
commit 006815eed0
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/DEPS
View File

@ -130,6 +130,8 @@ specific_include_rules = {
"+media/base/media_engine.h",
"+p2p/base/port.h",
"+p2p/base/port_allocator.h",
# TODO(https://crbug.com/1212611) Remove once includes fixed in nearby.
"+rtc_base/event.h",
"+rtc_base/network.h",
"+rtc_base/network_constants.h",
"+rtc_base/network_monitor_factory.h",

2
api/peer_connection_interface.h
View File

@ -125,6 +125,8 @@
// PortAllocator in the PeerConnection api. This will let us remove nogncheck.
#include "p2p/base/port.h" // nogncheck
#include "p2p/base/port_allocator.h" // nogncheck
// TODO(https://crbug.com/1212611) Remove once includes fixed in nearby.
#include "rtc_base/event.h"
#include "rtc_base/network.h"
#include "rtc_base/network_constants.h"
#include "rtc_base/network_monitor_factory.h"