Move Chromium logging into rtc_base_approved.
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}
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 2e51d3f..db76225 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -97,6 +97,7 @@
# 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 @@
"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 @@
}
if (build_with_chromium) {
- sources += [
- "../../webrtc_overrides/webrtc/base/logging.cc",
- "../../webrtc_overrides/webrtc/base/logging.h",
- ]
-
deps += [ "..:webrtc_common" ]
if (is_win) {
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 59f9637..1158984 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -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!': [
