summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorBrett Wilson <brettw@chromium.org>2014-08-25 13:15:44 -0700
committerBrett Wilson <brettw@chromium.org>2014-08-25 20:18:00 +0000
commit0ab2c722a1bad95a2748dbc3911c742dc04828db (patch)
tree7e1c6cd4c8418bb194a3e033473715a54bbc8e18 /third_party
parent577803cd5ac9c7e65cb39f4b18688ff841e82500 (diff)
downloadchromium_src-0ab2c722a1bad95a2748dbc3911c742dc04828db.zip
chromium_src-0ab2c722a1bad95a2748dbc3911c742dc04828db.tar.gz
chromium_src-0ab2c722a1bad95a2748dbc3911c742dc04828db.tar.bz2
Windows fixes for GN build.
R=scottmg@chromium.org Review URL: https://codereview.chromium.org/498393002 Cr-Commit-Position: refs/heads/master@{#291749}
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libjingle/BUILD.gn6
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index cc83b29..352df17 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -255,8 +255,8 @@ static_library("libjingle") {
]
# From libjingle_common.gypi's conditions list.
- if (is_win && !nacl_untrusted_build) {
- cflags += [ "/wd4005", "\wd4267" ]
+ if (is_win) {
+ cflags = [ "/wd4005", "/wd4267" ]
}
forward_dependent_configs_from = [
@@ -337,7 +337,7 @@ source_set("peerconnnection_server") {
]
if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- cflags += [ "/wd4309" ]
+ cflags = [ "/wd4309" ]
}
}