diff options
| author | dsinclair <dsinclair@chromium.org> | 2017-04-20 18:47:12 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-20 18:59:05 +0000 |
| commit | 58532b670716d5fe3ab024475fa1aa1580ecfe5b (patch) | |
| tree | 092a12f107ecbfaa0eee3a27651c8edf92af71db /third_party | |
| parent | 283a0433b081f88275b2f7e8c04d3c41b9187ca6 (diff) | |
| download | pdfium-58532b670716d5fe3ab024475fa1aa1580ecfe5b.tar.xz | |
Revert "core: allow building against system zlib"
This reverts commit 36c5b170e722362d4b5f7cb6e4e0099ed227a307.
Reason for revert: This appears to be blocking the roll into Chromium.
https://chromium-review.googlesource.com/c/476165/
Original change's description:
> core: allow building against system zlib
>
> In a way similar to the existing USE_SYSTEM_LIBJPEG. The default is of
> course still the DEPS-based zlib checkout.
>
> Change-Id: I649e75beb1a19c4cf7abda42fa10ebe5babfe946
> Reviewed-on: https://pdfium-review.googlesource.com/4070
> Reviewed-by: Lei Zhang <thestig@chromium.org>
> Commit-Queue: Lei Zhang <thestig@chromium.org>
>
TBR=thestig@chromium.org,dsinclair@chromium.org,npm@chromium.org,vmiklos@collabora.co.uk,pdfium-reviews@googlegroups.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I1ee6fb002f444ff9b559ce6a69679e63de7ff9cc
Reviewed-on: https://pdfium-review.googlesource.com/4393
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/BUILD.gn | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 17c9c22832..c270a1063a 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -288,8 +288,6 @@ if (!build_with_chromium) { # Uses libjpeg_turbo as the jpeg implementation. Has no effect if # use_system_libjpeg is set. use_libjpeg_turbo = true - - use_system_zlib = false } config("system_libjpeg_config") { @@ -318,21 +316,6 @@ 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") { @@ -412,7 +395,7 @@ static_library("fx_lpng") { defines = [] cflags = [] deps = [ - "//third_party:zlib", + "//third_party/zlib", ] if (current_cpu == "x86" || current_cpu == "x64") { @@ -452,7 +435,7 @@ if (pdf_enable_xfa) { } deps = [ "//third_party:jpeg", - "//third_party:zlib", + "//third_party/zlib", ] sources = [ "libtiff/tif_aux.c", |