diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-03-31 13:33:12 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-31 20:51:48 +0000 |
| commit | a2af7de2e32e6938dd825acb8df775b11ec95510 (patch) | |
| tree | 883664ee920a8fd64dbc96bec8cb59fe1c7ce760 /core | |
| parent | bdbb0bd92bfca52e574106c4ce5f93d9d34d3373 (diff) | |
| download | pdfium-a2af7de2e32e6938dd825acb8df775b11ec95510.tar.xz | |
Move zlib to a DEPS-based checkout.
BUG=chromium:541704
Change-Id: I313d8853450ff5940b3baa4054ff441b342c46b7
Reviewed-on: https://pdfium-review.googlesource.com/3350
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/fxcodec/DEPS | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_flate.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/fxcodec/DEPS b/core/fxcodec/DEPS index 85e74dd5a3..f82f477616 100644 --- a/core/fxcodec/DEPS +++ b/core/fxcodec/DEPS @@ -4,5 +4,5 @@ include_rules = [ # For non-standalone builds that may use libjpeg_turbo. '+third_party/libjpeg_turbo/jpeglib.h', '+third_party/libopenjpeg20', - '+third_party/zlib_v1211', + '+third_party/zlib', ] diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp index 269bf58813..c73703fba5 100644 --- a/core/fxcodec/codec/fx_codec_flate.cpp +++ b/core/fxcodec/codec/fx_codec_flate.cpp @@ -15,7 +15,7 @@ #include "core/fxcrt/fx_ext.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/ptr_util.h" -#include "third_party/zlib_v1211/zlib.h" +#include "third_party/zlib/zlib.h" extern "C" { |