summaryrefslogtreecommitdiffstats
path: root/rlz
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2014-11-17 17:54:55 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-18 01:55:10 +0000
commitde7d0dc942b1e296a0e9bd667f020ffd486cc32e (patch)
tree20701d9c168101ade29a02cd51710347c3dc3aaa /rlz
parent41b0acac5f6ae101df41208dd721b0a7a647c17d (diff)
downloadchromium_src-de7d0dc942b1e296a0e9bd667f020ffd486cc32e.zip
chromium_src-de7d0dc942b1e296a0e9bd667f020ffd486cc32e.tar.gz
chromium_src-de7d0dc942b1e296a0e9bd667f020ffd486cc32e.tar.bz2
Fix various flags in the Win64 GN build
-disable chromium_code for third_party/zlib - suppress a few size_t -> int conversion warnings - suppress /wd4121 (structure padding) by default; was suppressed in GYP but not GN. Also disable ffmpeg, which doesn't work in the 64-bit build yet. R=scottmg@chromium.org TBR=brettw@chromium.org BUG=432375, 167187 Review URL: https://codereview.chromium.org/737633002 Cr-Commit-Position: refs/heads/master@{#304542}
Diffstat (limited to 'rlz')
-rw-r--r--rlz/BUILD.gn5
1 files changed, 5 insertions, 0 deletions
diff --git a/rlz/BUILD.gn b/rlz/BUILD.gn
index 3a23d7d..0887ef4 100644
--- a/rlz/BUILD.gn
+++ b/rlz/BUILD.gn
@@ -114,6 +114,11 @@ test("rlz_unittests") {
"//testing/gtest",
"//third_party/zlib",
]
+
+ if (is_win) {
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ cflags = [ "/wd4267" ]
+ }
}
executable("rlz_id") {