diff options
| author | brettw@chromium.org <brettw@chromium.org> | 2014-09-09 19:15:33 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org> | 2014-09-09 19:15:33 +0000 |
| commit | 02002ef56c03bcb4000b72e139824e90cd7c1e5a (patch) | |
| tree | dcab555791a6d6085100d7d36e48d9677ce92264 | |
| parent | 0cdce7c07a77d724f5d7f5f85918b1a1fb9a7e62 (diff) | |
| download | webrtc-02002ef56c03bcb4000b72e139824e90cd7c1e5a.tar.gz | |
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/webrtc@7122 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | BUILD.gn | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 |