commit e40a7ee0074e1bbb954e9bfbf8fabb7f73ec5d01
author kjellander <kjellander@webrtc.org> Mon Oct 17 06:56:12 2016
committer Commit bot <commit-bot@chromium.org> Mon Oct 17 06:56:20 2016
tree e0a76eac0d67f0b31a48c5d27cef05ebebb0a003
parent 671534e76da19f3df60f0dd04b476568bbeada40

GN: Exclude suppressions of Chromium Clang warnings for Chromium builds.

These suppressions are causing GN errors when Chromium targets are depending
directly on WebRTC targets (needed for https://codereview.chromium.org/2413103004)

BUG=webrtc:4256
NOTRY=True

Review-Url: https://codereview.webrtc.org/2408133008
Cr-Commit-Position: refs/heads/master@{#14644}

webrtc/logging/BUILD.gn

diff --git a/webrtc/logging/BUILD.gn b/webrtc/logging/BUILD.gn
index 7078963..fa28065 100644
--- a/webrtc/logging/BUILD.gn
+++ b/webrtc/logging/BUILD.gn
@@ -39,9 +39,8 @@
     defines += [ "ENABLE_RTC_EVENT_LOG" ]
     deps += [ ":rtc_event_log_proto" ]
   }
-  if (is_clang && !is_nacl) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+  if (!build_with_chromium && is_clang) {
+    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 }
@@ -62,9 +61,8 @@
       "//testing/gmock",
       "//testing/gtest",
     ]
-    if (is_clang) {
-      # Suppress warnings from the Chromium Clang plugin.
-      # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
@@ -91,9 +89,8 @@
       "..:webrtc_common",
     ]
 
-    if (is_clang && !is_nacl) {
-      # Suppress warnings from Chrome's Clang plugins.
-      # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }