summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-02-24 14:09:55 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-02-24 14:09:55 -0500
commit4ca48d1b10998f6c77683f184b8c8c53c7121b9b (patch)
tree52e49c690ea750810a9270c96b0114c4919e0c8f /third_party
parent76ed0e30bd35f38b5f558417dfb3f6b34beef940 (diff)
downloadpdfium-4ca48d1b10998f6c77683f184b8c8c53c7121b9b.tar.xz
Silence shift-negative-value warnings in third_party
These are in third_party libraries so should be fixed upstream. Silencing the warning in our build. R=thestig@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/1734663002 .
Diffstat (limited to 'third_party')
-rw-r--r--third_party/BUILD.gn17
-rw-r--r--third_party/third_party.gyp8
2 files changed, 25 insertions, 0 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 2468dd4e5d..933e92a2ac 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -177,11 +177,19 @@ source_set("fx_lcms2") {
}
# This is only used for standalone builds.
+config("jpeg_warnings") {
+ visibility = [ ":*" ]
+ cflags = [ "-Wno-shift-negative-value" ]
+}
+
source_set("jpeg") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
"//third_party/pdfium:pdfium_config",
+
+ # Must be after no_chromium_code for warning flags to be ordered correctly.
+ ":jpeg_warnings",
]
sources = [
"libjpeg/cderror.h",
@@ -353,11 +361,20 @@ if (pdf_enable_xfa) {
}
}
+# TODO(dsinclair): Remove if fixed upstream. https://crbug.com/507712
+config("fx_zlib_warnings") {
+ visibility = [ ":*" ]
+ cflags = [ "-Wno-shift-negative-value" ]
+}
+
source_set("fx_zlib") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
"//third_party/pdfium:pdfium_config",
+
+ # Must be after no_chromium_code for warning flags to be ordered correctly.
+ ":fx_zlib_warnings",
]
sources = [
"zlib_v128/adler32.c",
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 97deacf49c..0208fa14e3 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -230,6 +230,9 @@
'libjpeg/jversion.h',
'libjpeg/transupp.h',
],
+ 'cflags': [
+ '-Wno-shift-negative-value',
+ ],
'conditions': [
['os_posix==1', {
'cflags': [
@@ -313,6 +316,11 @@
'zlib_v128/uncompr.c',
'zlib_v128/zutil.c',
],
+ 'cflags': [
+ # TODO(dsinclair): Remove if fixed upstream. https://crbug.com/507712
+ '-Wno-shift-negative-value',
+ ],
+
},
{
'target_name': 'pdfium_base',