diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_flate.cpp | 5 | ||||
| -rw-r--r-- | pdfium.gni | 3 | ||||
| -rw-r--r-- | skia/BUILD.gn | 2 | ||||
| -rw-r--r-- | third_party/BUILD.gn | 19 |
6 files changed, 28 insertions, 4 deletions
@@ -36,6 +36,7 @@ Robert Sesek <rsesek@chromium.org> Sam Clegg <sbc@chromium.org> Thomas Sepez <tsepez@chromium.org> +Collabora Ltd. <*@collabora.co.uk> DocsCorp Pty Ltd. <*@docscorp.com> Foxit Software Inc <*@foxitsoftware.com> Google Inc. <*@google.com> @@ -702,8 +702,8 @@ static_library("fxcodec") { ":fxcrt", "third_party:fx_lcms2", "third_party:fx_libopenjpeg", + "third_party:zlib", "//third_party:jpeg", - "//third_party/zlib:zlib", ] if (pdf_enable_xfa) { diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp index 4d1e034a23..5af3e99c2e 100644 --- a/core/fxcodec/codec/fx_codec_flate.cpp +++ b/core/fxcodec/codec/fx_codec_flate.cpp @@ -15,7 +15,12 @@ #include "core/fxcrt/fx_extension.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/ptr_util.h" + +#if defined(USE_SYSTEM_ZLIB) +#include <zlib.h> +#else #include "third_party/zlib/zlib.h" +#endif extern "C" { diff --git a/pdfium.gni b/pdfium.gni index 5fda06f5f0..d570385406 100644 --- a/pdfium.gni +++ b/pdfium.gni @@ -52,4 +52,7 @@ declare_args() { # Enable coverage information use_coverage = false + + # Don't build against bundled zlib. + use_system_zlib = false } diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 0760246f46..9f60fcdc1e 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -317,8 +317,8 @@ component("skia") { deps = [ ":skia_opts", + "../third_party:zlib", "//:freetype_common", - "//third_party/zlib:zlib", ] if (is_linux) { diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 7730212c75..4e12741f69 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -321,6 +321,21 @@ if (!build_with_chromium) { } } +config("system_zlib_config") { + libs = [ "z" ] + defines = [ "USE_SYSTEM_ZLIB" ] +} + +group("zlib") { + if (use_system_zlib) { + public_configs = [ ":system_zlib_config" ] + } else { + public_deps = [ + "//third_party/zlib", + ] + } +} + config("fx_libopenjpeg_warnings") { visibility = [ ":*" ] if (is_win) { @@ -398,7 +413,7 @@ static_library("fx_lpng") { defines = [] cflags = [] deps = [ - "//third_party/zlib", + ":zlib", ] if (current_cpu == "x86" || current_cpu == "x64") { @@ -437,8 +452,8 @@ if (pdf_enable_xfa) { configs -= [ "//build/config/win:lean_and_mean" ] } deps = [ + ":zlib", "//third_party:jpeg", - "//third_party/zlib", ] sources = [ "libtiff/tif_aux.c", |