Move Chromium logging into rtc_base_approved.

webrtc/base/BUILD.gn

Index: webrtc/base/BUILD.gn
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 2e51d3f0111e342d38cf4171ba31e7926da9b5e2..db762250a3061da5dcff275fd47ab2f7d5f47d3a 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -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",

[Henrik Grunell WebRTC, 2015/11/26 11:42:44]

constructormagic.h isn't in the gyp file for this target. Which one is correct?

[pbos-webrtc, 2015/11/26 11:48:07]

It is, but it's also excluded from rtc_base which should be a no-op since it's
not present there.

We can build this file in Chromium due to your RTC_ prefixes. CL here that
cleans this up: https://codereview.webrtc.org/1477013003/

[Henrik Grunell WebRTC, 2015/11/26 11:52:07]

Acknowledged.

       "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) {