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

Unified Diff: webrtc/logging/BUILD.gn

Issue 2380683005: Moved RtcEventLog files from call/ to logging/ (new top level dir) (Closed)
Patch Set: Rebase to master Created 4 years, 2 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 | « webrtc/call/webrtc_call.gypi ('k') | webrtc/logging/OWNERS » ('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/call/BUILD.gn b/webrtc/logging/BUILD.gn
similarity index 52%
copy from webrtc/call/BUILD.gn
copy to webrtc/logging/BUILD.gn
index 648bc85e0fc130a88fdd144cca54a1f35ccdccf2..7078963d1ee32655c1e099b11b89f95d0c802dcc 100644
--- a/webrtc/call/BUILD.gn
+++ b/webrtc/logging/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
@@ -7,52 +7,37 @@
# be found in the AUTHORS file in the root of the source tree.
import("../build/webrtc.gni")
+import("//third_party/protobuf/proto_library.gni")
+if (is_android) {
+ import("//build/config/android/config.gni")
+ import("//build/config/android/rules.gni")
+}
-rtc_static_library("call") {
+rtc_source_set("rtc_event_log_api") {
sources = [
- "bitrate_allocator.cc",
- "call.cc",
- "transport_adapter.cc",
- "transport_adapter.h",
- ]
-
- if (is_clang) {
- # Suppress warnings from Chrome's Clang plugins.
- # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
- suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
- }
-
- deps = [
- ":rtc_event_log",
- "..:webrtc_common",
- "../api:call_api",
- "../audio",
- "../base:rtc_task_queue",
- "../modules/congestion_controller",
- "../modules/rtp_rtcp",
- "../system_wrappers",
- "../video",
+ "rtc_event_log/rtc_event_log.h",
]
}
-rtc_static_library("rtc_event_log") {
+rtc_static_library("rtc_event_log_impl") {
sources = [
- "rtc_event_log.cc",
- "rtc_event_log.h",
- "rtc_event_log_helper_thread.cc",
- "rtc_event_log_helper_thread.h",
+ "rtc_event_log/ringbuffer.h",
+ "rtc_event_log/rtc_event_log.cc",
+ "rtc_event_log/rtc_event_log_helper_thread.cc",
+ "rtc_event_log/rtc_event_log_helper_thread.h",
]
defines = []
deps = [
+ ":rtc_event_log_api",
"..:webrtc_common",
"../modules/rtp_rtcp",
]
if (rtc_enable_protobuf) {
defines += [ "ENABLE_RTC_EVENT_LOG" ]
- deps += [ "..:rtc_event_log_proto" ]
+ deps += [ ":rtc_event_log_proto" ]
}
if (is_clang && !is_nacl) {
# Suppress warnings from Chrome's Clang plugins.
@@ -62,17 +47,18 @@ rtc_static_library("rtc_event_log") {
}
if (rtc_include_tests) {
- rtc_source_set("call_tests") {
+ rtc_source_set("rtc_event_log_tests") {
testonly = true
sources = [
- "bitrate_allocator_unittest.cc",
- "bitrate_estimator_tests.cc",
- "call_unittest.cc",
- "packet_injection_tests.cc",
- "ringbuffer_unittest.cc",
+ "rtc_event_log/ringbuffer_unittest.cc",
+ "rtc_event_log/rtc_event_log_unittest.cc",
+ "rtc_event_log/rtc_event_log_unittest_helper.cc",
]
deps = [
- ":call",
+ ":rtc_event_log_impl",
+ ":rtc_event_log_parser",
+ "../modules/rtp_rtcp",
+ "../system_wrappers:metrics_default",
"//testing/gmock",
"//testing/gtest",
]
@@ -82,22 +68,31 @@ if (rtc_include_tests) {
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
- rtc_source_set("rtc_event_log_tests") {
- testonly = true
+}
+
+if (rtc_enable_protobuf) {
+ proto_library("rtc_event_log_proto") {
sources = [
- "rtc_event_log_unittest.cc",
- "rtc_event_log_unittest_helper.cc",
+ "rtc_event_log/rtc_event_log.proto",
]
- deps = [
- ":rtc_event_log",
- "..:rtc_event_log_parser",
- "../modules/rtp_rtcp",
- "../system_wrappers:metrics_default",
- "//testing/gmock",
- "//testing/gtest",
+ 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",
+ "rtc_event_log/rtc_event_log_parser.h",
]
- if (is_clang) {
- # Suppress warnings from the Chromium Clang plugin.
+
+ public_deps = [
+ ":rtc_event_log_proto",
+ "..:webrtc_common",
+ ]
+
+ if (is_clang && !is_nacl) {
+ # Suppress warnings from Chrome's Clang plugins.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
« no previous file with comments | « webrtc/call/webrtc_call.gypi ('k') | webrtc/logging/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698