| Index: webrtc/BUILD.gn
|
| diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
|
| index eb69eee63c20729024d1fb10a3293fc212d5c169..79a962972bec691d1d4a0f34fc7f04931d607ca0 100644
|
| --- a/webrtc/BUILD.gn
|
| +++ b/webrtc/BUILD.gn
|
| @@ -302,9 +302,8 @@ rtc_static_library("webrtc_common") {
|
| "voice_engine_configurations.h",
|
| ]
|
|
|
| - 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" ]
|
| }
|
| }
|
| @@ -482,9 +481,8 @@ if (rtc_include_tests) {
|
|
|
| configs += [ ":rtc_unittests_config" ]
|
|
|
| - 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" ]
|
| }
|
|
|
| @@ -534,9 +532,8 @@ if (rtc_include_tests) {
|
| rtc_test("xmllite_xmpp_unittests") {
|
| configs += [ ":rtc_unittests_config" ]
|
|
|
| - 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" ]
|
| }
|
|
|
| @@ -599,9 +596,8 @@ if (rtc_include_tests) {
|
| "video:video_tests",
|
| ]
|
| data = video_engine_tests_resources
|
| - 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" ]
|
| }
|
| if (is_android) {
|
| @@ -628,9 +624,8 @@ if (rtc_include_tests) {
|
| if (!is_android) {
|
| deps += [ "modules/video_capture:video_capture_internal_impl" ]
|
| }
|
| - 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" ]
|
| }
|
| }
|
| @@ -691,9 +686,8 @@ if (rtc_include_tests) {
|
| "//testing/gtest",
|
| "//third_party/gflags",
|
| ]
|
| - 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" ]
|
| }
|
| }
|
| @@ -742,9 +736,8 @@ if (rtc_include_tests) {
|
| if (is_ios) {
|
| deps += [ ":webrtc_perf_tests_bundle_data" ]
|
| }
|
| - 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" ]
|
| }
|
| }
|
| @@ -773,9 +766,8 @@ if (rtc_include_tests) {
|
| shard_timeout = 900
|
| }
|
|
|
| - 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" ]
|
| }
|
| }
|
|
|