diff options
| author | Nico Weber <thakis@chromium.org> | 2015-10-30 12:03:50 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-10-30 12:03:50 -0700 |
| commit | 23e20f2d3ce5b416e1c7f7f1c2d68c90ddf2d4ad (patch) | |
| tree | 621772e7d059281396246f282fc06adeab419929 | |
| parent | c91d5c276b6b986f645d34a0e583fbe4f73e74bc (diff) | |
| download | pdfium-23e20f2d3ce5b416e1c7f7f1c2d68c90ddf2d4ad.tar.xz | |
chromium_code tweaks for Windows and Linux/gyp.
BUG=pdfium:29
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1431563002 .
| -rw-r--r-- | BUILD.gn | 6 | ||||
| -rw-r--r-- | pdfium.gyp | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -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': [ |