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

GN: Refactor so that WebRTC compiles with rtc_enable_protobuf=false.

Browse Source 
This is a first step towards it. I plan to refactor modules_unittests before continuing with this.

BUG=webrtc:6626
NOTRY=True

Review-Url: https://codereview.webrtc.org/2626163004
Cr-Commit-Position: refs/heads/master@{#16109}
This commit is contained in:
ehmaldonado
2017-01-17 02:37:34 -08:00
committed by Commit bot
parent ece0571d44
commit 1fd08c1e67
3 changed files with 77 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
webrtc/logging/BUILD.gn
View File

@ -55,30 +55,6 @@ rtc_static_library("rtc_event_log_impl") {
}
}
if (rtc_include_tests) {
rtc_source_set("rtc_event_log_tests") {
testonly = true
sources = [
"rtc_event_log/ringbuffer_unittest.cc",
"rtc_event_log/rtc_event_log_unittest.cc",
"rtc_event_log/rtc_event_log_unittest_helper.cc",
]
deps = [
":rtc_event_log_impl",
":rtc_event_log_parser",
"../call",
"../modules/rtp_rtcp",
"../system_wrappers:metrics_default",
"//testing/gmock",
"//testing/gtest",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
}
if (rtc_enable_protobuf) {
proto_library("rtc_event_log_proto") {
sources = [
@ -86,9 +62,7 @@ if (rtc_enable_protobuf) {
]
proto_out_dir = "webrtc/logging/rtc_event_log"
}
}
if (rtc_enable_protobuf) {
rtc_static_library("rtc_event_log_parser") {
sources = [
"rtc_event_log/rtc_event_log_parser.cc",
@ -105,4 +79,28 @@ if (rtc_enable_protobuf) {
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
if (rtc_include_tests) {
rtc_source_set("rtc_event_log_tests") {
testonly = true
sources = [
"rtc_event_log/ringbuffer_unittest.cc",
"rtc_event_log/rtc_event_log_unittest.cc",
"rtc_event_log/rtc_event_log_unittest_helper.cc",
]
deps = [
":rtc_event_log_impl",
":rtc_event_log_parser",
"../call",
"../modules/rtp_rtcp",
"../system_wrappers:metrics_default",
"//testing/gmock",
"//testing/gtest",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
}
}