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 /third_party/BUILD.gn | |
| 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 'third_party/BUILD.gn')
| -rw-r--r-- | third_party/BUILD.gn | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 3ed7487104..27abf1891b 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -432,6 +432,9 @@ static_library("fx_lpng") { defines = [] cflags = [] + deps = [ + "//third_party/zlib", + ] if (current_cpu == "x86" || current_cpu == "x64") { sources += [ @@ -470,6 +473,7 @@ if (pdf_enable_xfa) { } deps = [ "//third_party:jpeg", + "//third_party/zlib", ] sources = [ "libtiff/tif_aux.c", @@ -513,31 +517,6 @@ if (pdf_enable_xfa) { } } -static_library("fx_zlib") { - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ - "//build/config/compiler:no_chromium_code", - ":pdfium_third_party_config", - ] - sources = [ - "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", - ] -} - source_set("pdfium_base") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ |