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

Prefix ENABLE_RTC_EVENT_LOG with WEBRTC_.

Browse Source 
Since this macro can be considered public, it makes sense to prefix it
with WEBRTC_ (also to avoid potential conflicts with client code).

This CL also removes some definitions of this macro in order to define
it only where it is strictly needed (it is only used in a .cc file).

Bug: webrtc:11142
Change-Id: Idce7389301e71d8434e238b3cf4ceaa9cf97cd87
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161008
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29957}
This commit is contained in:
Mirko Bonadei
2019-11-28 16:27:47 +01:00
committed by Commit Bot
parent a3cd717bb6
commit c7a3b08f07
5 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@ -476,7 +476,6 @@ if (!build_with_chromium) {
} }
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
defines += [ "ENABLE_RTC_EVENT_LOG" ]
deps += [ "logging:rtc_event_log_proto" ] deps += [ "logging:rtc_event_log_proto" ]
} }
} }

2
api/rtc_event_log/BUILD.gn
View File

@ -41,7 +41,7 @@ rtc_library("rtc_event_log_factory") {
] ]
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
defines = [ "ENABLE_RTC_EVENT_LOG" ] defines = [ "WEBRTC_ENABLE_RTC_EVENT_LOG" ]
deps += [ "../../logging:rtc_event_log_impl" ] deps += [ "../../logging:rtc_event_log_impl" ]
} }
} }

4
api/rtc_event_log/rtc_event_log_factory.cc
View File

@ -15,7 +15,7 @@
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#ifdef ENABLE_RTC_EVENT_LOG #ifdef WEBRTC_ENABLE_RTC_EVENT_LOG
#include "logging/rtc_event_log/rtc_event_log_impl.h" #include "logging/rtc_event_log/rtc_event_log_impl.h"
#endif #endif
@ -28,7 +28,7 @@ RtcEventLogFactory::RtcEventLogFactory(TaskQueueFactory* task_queue_factory)
std::unique_ptr<RtcEventLog> RtcEventLogFactory::CreateRtcEventLog( std::unique_ptr<RtcEventLog> RtcEventLogFactory::CreateRtcEventLog(
RtcEventLog::EncodingType encoding_type) { RtcEventLog::EncodingType encoding_type) {
#ifdef ENABLE_RTC_EVENT_LOG #ifdef WEBRTC_ENABLE_RTC_EVENT_LOG
return std::make_unique<RtcEventLogImpl>(encoding_type, task_queue_factory_); return std::make_unique<RtcEventLogImpl>(encoding_type, task_queue_factory_);
#else #else
return std::make_unique<RtcEventLogNull>(); return std::make_unique<RtcEventLogNull>();

2
logging/BUILD.gn
View File

@ -197,7 +197,6 @@ rtc_library("rtc_event_log_impl_encoder") {
] ]
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
defines += [ "ENABLE_RTC_EVENT_LOG" ]
deps += [ deps += [
":ice_log", ":ice_log",
":rtc_event_audio", ":rtc_event_audio",
@ -340,7 +339,6 @@ if (rtc_enable_protobuf) {
rtc_library("rtc_event_log_tests") { rtc_library("rtc_event_log_tests") {
testonly = true testonly = true
assert(rtc_enable_protobuf) assert(rtc_enable_protobuf)
defines = [ "ENABLE_RTC_EVENT_LOG" ]
sources = [ sources = [
"rtc_event_log/encoder/blob_encoding_unittest.cc", "rtc_event_log/encoder/blob_encoding_unittest.cc",
"rtc_event_log/encoder/delta_encoding_unittest.cc", "rtc_event_log/encoder/delta_encoding_unittest.cc",

2
rtc_tools/BUILD.gn
View File

@ -276,7 +276,6 @@ if (!build_with_chromium) {
"rtc_event_log_visualizer/plot_python.h", "rtc_event_log_visualizer/plot_python.h",
"rtc_event_log_visualizer/triage_notifications.h", "rtc_event_log_visualizer/triage_notifications.h",
] ]
defines = [ "ENABLE_RTC_EVENT_LOG" ]
deps = [ deps = [
":chart_proto", ":chart_proto",
"../api:function_view", "../api:function_view",
@ -321,7 +320,6 @@ if (rtc_include_tests) {
"rtc_event_log_visualizer/main.cc", "rtc_event_log_visualizer/main.cc",
] ]
defines = [ "ENABLE_RTC_EVENT_LOG" ]
deps = [ deps = [
":event_log_visualizer_utils", ":event_log_visualizer_utils",
"../api/neteq:neteq_api", "../api/neteq:neteq_api",