Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Unified Diff: webrtc/logging/BUILD.gn

Issue 2626163004: GN: Refactor so that WebRTC compiles with rtc_enable_protobuf=false. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/logging/BUILD.gn
diff --git a/webrtc/logging/BUILD.gn b/webrtc/logging/BUILD.gn
index 2daaef4ffcf8ef26d5cdfe54df9c4f789774e440..98776d3f90ee750e29978d8301c2a37a7c2f2ed7 100644
--- a/webrtc/logging/BUILD.gn
+++ b/webrtc/logging/BUILD.gn
@@ -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" ]
+ }
+ }
+ }
}
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698