From 9fe11010f7fb74266d84a59698fb34ecefee5d08 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 9 Sep 2014 19:15:33 +0000 Subject: [PATCH] Fix the RTC+Chromium GN build. LOGGING_INSIDE_WEBRTC was being set in the inherited config, whereas in the GYP build this define is not inherited. This caused duplicate logging macros to be defined in Chrome files dependening on WebRTC targets. Move LOGGING_INSIDE_WEBRTC to the common config (non-inherited). TBR=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/25449004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7122 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/BUILD.gn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index ce20d86839..a361fc2673 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -23,7 +23,6 @@ config("common_inherited_config") { if (build_with_chromium) { defines = [ "WEBRTC_CHROMIUM_BUILD", - "LOGGING_INSIDE_WEBRTC", ] include_dirs = [ # overrides must be included first as that is the mechanism for @@ -89,7 +88,9 @@ config("common_config") { defines += [ "WEBRTC_MODULE_UTILITY_VIDEO" ] } - if (!build_with_chromium) { + if (build_with_chromium) { + defines += [ "LOGGING_INSIDE_WEBRTC" ] + } else { if (is_posix) { # -Wextra is currently disabled in Chromium"s common.gypi. Enable # for targets that can handle it. For Android/arm64 right now