From 23e20f2d3ce5b416e1c7f7f1c2d68c90ddf2d4ad Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 30 Oct 2015 12:03:50 -0700 Subject: chromium_code tweaks for Windows and Linux/gyp. BUG=pdfium:29 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1431563002 . --- BUILD.gn | 6 ++++++ pdfium.gyp | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index fa6c90653f..3e1b89c366 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -38,6 +38,12 @@ config("pdfium_config") { "/wd4146", "/wd4333", "/wd4345", + # TODO(thestig): Fix all instances, remove this, pdfium:29 + "/wd4245", + "/wd4389", + "/wd4701", + "/wd4706", + "/wd4800", ] } diff --git a/pdfium.gyp b/pdfium.gyp index 8788794848..5637dbbf9b 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -41,13 +41,17 @@ }], ], 'msvs_disabled_warnings': [ - 4005, 4018, 4146, 4333, 4345, 4267 + 4005, 4018, 4146, 4333, 4345, 4267, + # TODO(thestig): Fix all instances, remove this, pdfium:29 + 4245, 4389, 4701, 4706, 4800, ], 'variables': { 'clang_warning_flags': [ # TODO(thestig): Fix all instances, remove this, pdfium:29 '-Wno-sign-compare', ], + # Make sure Chromium's build/common.gypi doesn't re-add the flag on linux. + 'cflags_cc!': [ '-Wsign-compare' ], }, }, 'targets': [ -- cgit v1.2.3