Move Chromium logging into rtc_base_approved.

webrtc/base/BUILD.gn

 # Copyright (c) 2014 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("//build/config/crypto.gni")
 import("//build/config/ui.gni")
@@ skipping 79 matching lines @@
 if (rtc_build_ssl == 0) {
   config("external_ssl_library") {
     assert(rtc_ssl_root != "",
            "You must specify rtc_ssl_root when rtc_build_ssl==0.")
     include_dirs = [ rtc_ssl_root ]
   }
 }
 
 # 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" ]
 
   sources = [
     "array_view.h",
     "atomicops.h",
     "bitbuffer.cc",
     "bitbuffer.h",
     "buffer.cc",
     "buffer.h",
@@ skipping 34 matching lines @@
     "template_util.h",
     "thread_annotations.h",
     "thread_checker.h",
     "thread_checker_impl.cc",
     "thread_checker_impl.h",
     "timeutils.cc",
     "timeutils.h",
     "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",
       "logging.h",
     ]
   }
 }
 
 static_library("rtc_base") {
   cflags = []
   cflags_cc = []
   libs = []
@@ skipping 151 matching lines @@
   ]
 
   if (is_posix) {
     sources += [
       "unixfilesystem.cc",
       "unixfilesystem.h",
     ]
   }
 
   if (build_with_chromium) {
-    sources += [
-      "../../webrtc_overrides/webrtc/base/logging.cc",
-      "../../webrtc_overrides/webrtc/base/logging.h",
-    ]
-
     deps += [ "..:webrtc_common" ]
 
     if (is_win) {
       sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
     }
 
     include_dirs = [
       "../../webrtc_overrides",
       "../../boringssl/src/include",
     ]
@@ skipping 251 matching lines @@
       "linux.cc",
       "linux.h",
     ]
   }
 
   if (is_nacl) {
     deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
     defines += [ "timezone=_timezone" ]
   }
 }