commit 77f6db7a0b7856376553b470dbe3940a4fbbc30c
author Ryan Harrison <rharrison@chromium.org> Thu Nov 28 19:48:45 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Nov 28 19:48:45 2019 +0000
tree 953f9791e88858acfc82d6281788a8ec61988806
parent 40b10e4d659d5682208c6c5535114c3290df925d

Fix BUILD.gn issues for Android & Fuschia

BUG=dawn:287

Change-Id: If39e1211cedefa5d02f1ea2f3ae00f6195e1e916
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/14141
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>

third_party/BUILD.gn

diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 1004136..6ecb9cb 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -16,8 +16,6 @@
 import("../scripts/dawn_features.gni")
 import("../scripts/dawn_overrides_with_defaults.gni")
 
-is_msvc = is_win && !is_clang
-
 ###############################################################################
 # Third-party dependencies needed by libdawn_native
 ###############################################################################
@@ -166,7 +164,7 @@
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [ "//build/config/compiler:no_chromium_code" ]
 
-    if (is_msvc) {
+    if (is_win && !is_clang) {
       # nonstandard extension, function/data pointer conversion in expression
       cflags_c = [ "/wd4152" ]
     } else {