commit 6f93de501d591a6c2980d38a1ff0a6b5e434b80a
author Tom Sepez <tsepez@chromium.org> Fri Jun 19 12:57:10 2015 -0700
committer Tom Sepez <tsepez@chromium.org> Fri Jun 19 12:57:10 2015 -0700
tree ebcf5e9817911e84b25c9f975ca8e0679d736b07
parent 6fd997b710e96e0c66d6dcd2e1c5cfd950d6accd

Merge to XFA: Move zlib to third_party/

(cherry picked from commit 959eb05140a8f5af7724a2da4cf5d04e2e50f4a6)
Original Review URL: https://codereview.chromium.org/1197693003.

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1197863002.

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 0199bea..050f93c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -318,6 +318,7 @@
     "third_party:fx_lcms2",
     "third_party:fx_libjpeg",
     "third_party:fx_libopenjpeg",
+    "third_party:fx_zlib",
   ]
   sources = [
     "core/include/fxcodec/fx_codec.h",
@@ -390,21 +391,6 @@
     "core/src/fxcodec/fx_tiff/src/fx_tif_write.c",
     "core/src/fxcodec/fx_tiff/src/fx_tif_zip.c",
     "core/src/fxcodec/fx_zlib/include/fx_zlib.h",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_adler32.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_compress.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_crc32.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_deflate.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_gzclose.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_gzlib.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_gzread.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_gzwrite.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_infback.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_inffast.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_inflate.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_inftrees.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_trees.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_uncompr.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_zutil.c",
     "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h",
     "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp",
     "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h",