Reason for revert: Starting to work on a fix (it seems that there are third_party dependencies that depends on the path to the webrtc.gni file) Original issue's description: > Revert of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2651543003/ ) > > Reason for revert: > This was causing the following failure: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Builder/builds/838/steps/generate_build_files/logs/stdio > > Original issue's description: > > Moving webrtc.gni up one level from build/ > > > > BUG=webrtc:7030 > > > > Review-Url: https://codereview.webrtc.org/2651543003 > > Cr-Commit-Position: refs/heads/master@{#16241} > > Committed:35a32700fc> > TBR=kjellander@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7030 > > Review-Url: https://codereview.webrtc.org/2657563002 > Cr-Commit-Position: refs/heads/master@{#16244} > Committed:69dc7dbe24TBR=kjellander@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7030 Review-Url: https://codereview.webrtc.org/2654773002 Cr-Commit-Position: refs/heads/master@{#16247}
108 lines
2.9 KiB
Plaintext
108 lines
2.9 KiB
Plaintext
# 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
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
import("../webrtc.gni")
|
|
import("//third_party/protobuf/proto_library.gni")
|
|
if (is_android) {
|
|
import("//build/config/android/config.gni")
|
|
import("//build/config/android/rules.gni")
|
|
}
|
|
|
|
group("logging") {
|
|
public_deps = [
|
|
":rtc_event_log_impl",
|
|
]
|
|
if (rtc_enable_protobuf) {
|
|
public_deps += [ ":rtc_event_log_parser" ]
|
|
}
|
|
}
|
|
|
|
rtc_source_set("rtc_event_log_api") {
|
|
sources = [
|
|
"rtc_event_log/rtc_event_log.h",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("rtc_event_log_impl") {
|
|
sources = [
|
|
"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",
|
|
"../call:call_interfaces",
|
|
"../modules/audio_coding:audio_network_adaptor",
|
|
"../modules/rtp_rtcp",
|
|
]
|
|
|
|
if (rtc_enable_protobuf) {
|
|
defines += [ "ENABLE_RTC_EVENT_LOG" ]
|
|
deps += [ ":rtc_event_log_proto" ]
|
|
}
|
|
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 = [
|
|
"rtc_event_log/rtc_event_log.proto",
|
|
]
|
|
proto_out_dir = "webrtc/logging/rtc_event_log"
|
|
}
|
|
|
|
rtc_static_library("rtc_event_log_parser") {
|
|
sources = [
|
|
"rtc_event_log/rtc_event_log_parser.cc",
|
|
"rtc_event_log/rtc_event_log_parser.h",
|
|
]
|
|
|
|
public_deps = [
|
|
":rtc_event_log_proto",
|
|
"..:webrtc_common",
|
|
]
|
|
|
|
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_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" ]
|
|
}
|
|
}
|
|
}
|
|
}
|