commit 9348d6fead3c0549b2e4d8c53027e8c902209373
author sergeyu <sergeyu@chromium.org> Wed Sep 02 21:22:40 2015
committer Commit bot <commit-bot@chromium.org> Wed Sep 02 21:22:48 2015
tree 5e921f817b2d93aee2ae6bf85d01ecf9a7bd4fb6
parent 4b4a8bb79d7e9e6e7928a7ef6338cda9d7046f85

GN: Fix compilation with NaCl toolchain

BUG=512899
TBR=kjellander@webrtc.org

Review URL: https://codereview.webrtc.org/1327853002

Cr-Original-Commit-Position: refs/heads/master@{#9846}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 4df08ff37459ee7c9d545c2574c1a84b5e968243

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index a3793f5..05e2e19 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -274,7 +274,7 @@
     defines += [ "ENABLE_RTC_EVENT_LOG" ]
     deps += [ ":rtc_event_log_proto" ]
   }
-  if (is_clang) {
+  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.
     configs -= [ "//build/config/clang:find_bad_constructs" ]

modules/desktop_capture/BUILD.gn

diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 17135cc..aa33993 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -127,7 +127,7 @@
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
 
-  if (is_clang) {
+  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.
     configs -= [ "//build/config/clang:find_bad_constructs" ]