From 06483ca0ceb8c3c8477dd6b95604dcfeed418a42 Mon Sep 17 00:00:00 2001 From: Tommi Date: Sun, 26 Nov 2017 18:22:52 +0100 Subject: [PATCH] Add support for the rtc::Event implementation in Chromium. See also: https://chromium-review.googlesource.com/c/chromium/src/+/789871 BUG=chromium:689520 Change-Id: I2a22d7aa4d5b91ad3481c64d15419c81ae1dd768 Reviewed-on: https://webrtc-review.googlesource.com/26021 Reviewed-by: Henrik Grunell Commit-Queue: Tommi Cr-Commit-Position: refs/heads/master@{#20889} --- rtc_base/BUILD.gn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index ae4101c29a..17d766f769 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -129,8 +129,6 @@ rtc_source_set("rtc_base_approved_generic") { "criticalsection.cc", "criticalsection.h", "deprecation.h", - "event.cc", - "event.h", "event_tracer.cc", "event_tracer.h", "file.cc", @@ -213,11 +211,15 @@ rtc_source_set("rtc_base_approved_generic") { # Dependency on chromium's logging (in //base). deps += [ "//base:base" ] sources += [ + "../../webrtc_overrides/rtc_base/event.cc", + "../../webrtc_overrides/rtc_base/event.h", "../../webrtc_overrides/rtc_base/logging.cc", "../../webrtc_overrides/rtc_base/logging.h", ] } else { sources += [ + "event.cc", + "event.h", "logging.cc", "logging.h", ]