admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Chromium logging into rtc_base_approved.

Browse Source 
The corresponding set of overrides weren't moved when logging.cc etc.
was moved over. This wasn't noticed because all existing targets before
webrtc fuzzers used to link both rtc_base and rtc_base_approved in
Chromium. Also adding //base:base as a dependency, this used to be
linked in by other targets either way before but generated build errors
when a target solely depends on rtc_base_approved.

BUG=webrtc:4771
R=kjellander@webrtc.org
TBR=henrikg@webrtc.org

Review URL: https://codereview.webrtc.org/1473223005 .

Cr-Commit-Position: refs/heads/master@{#10792}
This commit is contained in:
Peter Boström 2015-11-25 21:36:14 +01:00
parent 6e004a44e8
commit 11e022904d
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/base/BUILD.gn
View File

@ -97,6 +97,7 @@ if (rtc_build_ssl == 0) {
# The subset of rtc_base approved for use outside of libjingle.
static_library("rtc_base_approved") {
deps = []
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
@ -151,7 +152,15 @@ static_library("rtc_base_approved") {
"trace_event.h",
]
if (!build_with_chromium) {
if (build_with_chromium) {
# Dependency on chromium's logging (in //base).
deps += [ "//base:base" ]
sources += [
"../../webrtc_overrides/webrtc/base/logging.cc",
"../../webrtc_overrides/webrtc/base/logging.h",
]
include_dirs = [ "../../webrtc_overrides" ]
} else {
sources += [
"constructormagic.h",
"logging.cc",
@ -325,11 +334,6 @@ static_library("rtc_base") {
}
if (build_with_chromium) {
sources += [
"../../webrtc_overrides/webrtc/base/logging.cc",
"../../webrtc_overrides/webrtc/base/logging.h",
]
deps += [ "..:webrtc_common" ]
if (is_win) {

9
webrtc/base/base.gyp
View File

@ -85,9 +85,16 @@
],
'conditions': [
['build_with_chromium==1', {
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
],
'include_dirs': [
'../../webrtc_overrides',
],
'sources': [
'../../webrtc_overrides/webrtc/base/logging.cc',
'../../webrtc_overrides/webrtc/base/logging.h',
],
'sources!': [
'logging.cc',
'logging.h',
@ -380,8 +387,6 @@
'../../boringssl/src/include',
],
'sources': [
'../../webrtc_overrides/webrtc/base/logging.cc',
'../../webrtc_overrides/webrtc/base/logging.h',
'../../webrtc_overrides/webrtc/base/win32socketinit.cc',
],
'sources!': [