Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: third_party/third_party.gyp

Issue 1962863002: Make GYP and GN build consistent for third_party targets (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: change order Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/third_party.gyp
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 840c16635d2e37f42ab21fed70b3f6df0edbf39d..2e03b5965690598209c1207e73e1116d12cab3ad 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -18,9 +18,6 @@
'<(DEPTH)',
'..',
],
- 'msvs_disabled_warnings': [
- 4018, 4146, 4333, 4345, 4267
- ],
},
'targets': [
{
@@ -96,6 +93,11 @@
'-Wno-unused-function',
],
},
+ 'msvs_disabled_warnings': [
+ # Warnings about conversion from 'size_t' to 'long', possible loss of
+ # data.
+ 4267,
+ ],
},
{
'target_name': 'fx_agg',
@@ -253,7 +255,12 @@
# Avoid warning for undefined behaviour.
'-Wno-shift-negative-value',
],
- }
+ },
+ 'msvs_disabled_warnings': [
+ # Warnings about conversion from 'size_t' to 'long', possible loss of
+ # data.
+ 4267,
+ ],
},
{
'target_name': 'fx_libopenjpeg',
@@ -279,6 +286,9 @@
'libopenjpeg20/tcd.c',
'libopenjpeg20/tgt.c',
],
+ 'msvs_disabled_warnings': [
+ 4018,
+ ],
},
{
'target_name': 'fx_lpng',
@@ -413,8 +423,8 @@
'conditions': [
['OS=="win"', {
'defines!': [
- # Need to undefine the macro since it is redefined in
- # tif_ojpeg.c and tif_jpeg.c.
+ # Need to undefine the macro since it is redefined in
+ # tif_ojpeg.c and tif_jpeg.c.
'WIN32_LEAN_AND_MEAN',
],
}],
« no previous file with comments | « third_party/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698