diff options
| author | Adenilson Cavalcanti <adenilson.cavalcanti@arm.com> | 2017-03-23 11:04:40 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-27 14:27:21 +0000 |
| commit | 8e3f692b03e97659e855be4ea7c7b45d1c0f20c5 (patch) | |
| tree | c579d1744c9d1f56162a874dff687b55fb1b456a /third_party/BUILD.gn | |
| parent | f4a9f83b38a0a45cda3205ad50747e6a7719f8ab (diff) | |
| download | pdfium-8e3f692b03e97659e855be4ea7c7b45d1c0f20c5.tar.xz | |
Update to zlib 1.2.11
This is the same version used by Chromium (as
also the latest release of zlib).
BUG=687631
Change-Id: Ia4bcdee3c36443ba01914d157ea795d7fb881a45
Reviewed-on: https://pdfium-review.googlesource.com/3096
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/BUILD.gn')
| -rw-r--r-- | third_party/BUILD.gn | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index fdb17edbd3..cabd7af798 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -430,39 +430,28 @@ if (pdf_enable_xfa) { } } -# TODO(dsinclair): Remove if fixed upstream. https://crbug.com/507712 -config("fx_zlib_warnings") { - visibility = [ ":*" ] - if (is_clang) { - cflags = [ "-Wno-shift-negative-value" ] - } -} - static_library("fx_zlib") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code", ":pdfium_third_party_config", - - # Must be after no_chromium_code for warning flags to be ordered correctly. - ":fx_zlib_warnings", ] sources = [ - "zlib_v128/adler32.c", - "zlib_v128/compress.c", - "zlib_v128/crc32.c", - "zlib_v128/deflate.c", - "zlib_v128/gzclose.c", - "zlib_v128/gzlib.c", - "zlib_v128/gzread.c", - "zlib_v128/gzwrite.c", - "zlib_v128/infback.c", - "zlib_v128/inffast.c", - "zlib_v128/inflate.c", - "zlib_v128/inftrees.c", - "zlib_v128/trees.c", - "zlib_v128/uncompr.c", - "zlib_v128/zutil.c", + "zlib_v1211/adler32.c", + "zlib_v1211/compress.c", + "zlib_v1211/crc32.c", + "zlib_v1211/deflate.c", + "zlib_v1211/gzclose.c", + "zlib_v1211/gzlib.c", + "zlib_v1211/gzread.c", + "zlib_v1211/gzwrite.c", + "zlib_v1211/infback.c", + "zlib_v1211/inffast.c", + "zlib_v1211/inflate.c", + "zlib_v1211/inftrees.c", + "zlib_v1211/trees.c", + "zlib_v1211/uncompr.c", + "zlib_v1211/zutil.c", ] } |