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.

49 files changed, 53 insertions, 196 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 0199beadb4..050f93c70d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -318,6 +318,7 @@ static_library("fxcodec") {
     "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 @@ static_library("fxcodec") {
     "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",
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp
index 6c33d82ca3..ead5e2474a 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp
@@ -4,11 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../fx_zlib.h"
 #include "../../../include/fpdfapi/fpdf_parser.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
+#include "../../fxcodec/fx_zlib/include/fx_zlib.h"
 #include "filters_int.h"
+
 CFX_DataFilter::CFX_DataFilter()
 {
     m_bEOF = FALSE;
diff --git a/core/src/fx_zlib.h b/core/src/fx_zlib.h
deleted file mode 100644
index 57a0035a74..0000000000
--- a/core/src/fx_zlib.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef CORE_SRC_FX_ZLIB_H_
-#define CORE_SRC_FX_ZLIB_H_
-
-#include "fxcodec/fx_zlib/zlib_v128/zlib.h"
-
-#endif  // CORE_SRC_FX_ZLIB_H_
diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp
index a3e7b8a249..8add31f089 100644
--- a/core/src/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/src/fxcodec/codec/fx_codec_flate.cpp
@@ -6,7 +6,7 @@
 
 #include "../../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../../include/fxcodec/fx_codec.h"
-#include "../../fx_zlib.h"
+#include "../fx_zlib/include/fx_zlib.h"
 #include "codec_int.h"
 
 extern "C"
diff --git a/core/src/fxcodec/fx_zlib/include/fx_zlib.h b/core/src/fxcodec/fx_zlib/include/fx_zlib.h
index 89c8786188..88742f48d3 100644
--- a/core/src/fxcodec/fx_zlib/include/fx_zlib.h
+++ b/core/src/fxcodec/fx_zlib/include/fx_zlib.h
@@ -10,6 +10,6 @@
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_WARNINGS
 #endif
-#include "../zlib_v128/zlib.h"
+#include "../../../../../third_party/zlib_v128/zlib.h"
 
 #endif  // CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_adler32.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_adler32.c
deleted file mode 100644
index 38a35a03e7..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_adler32.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_adler32.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_compress.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_compress.c
deleted file mode 100644
index c88a675922..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_compress.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_compress.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_crc32.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_crc32.c
deleted file mode 100644
index e7f7453519..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_crc32.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_crc32.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_deflate.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_deflate.c
deleted file mode 100644
index 377779aedc..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_deflate.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_deflate.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_gzclose.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_gzclose.c
deleted file mode 100644
index 726cbc2390..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_gzclose.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/gzclose.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_gzlib.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_gzlib.c
deleted file mode 100644
index 3e95454682..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_gzlib.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/gzlib.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_gzread.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_gzread.c
deleted file mode 100644
index 2c14ff7468..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_gzread.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/gzread.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_gzwrite.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_gzwrite.c
deleted file mode 100644
index 2a37fed390..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_gzwrite.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/gzwrite.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_infback.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_infback.c
deleted file mode 100644
index 17bc781d06..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_infback.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_infback.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_inffast.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_inffast.c
deleted file mode 100644
index a6828cc424..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_inffast.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_inffast.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_inflate.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_inflate.c
deleted file mode 100644
index f28a389c07..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_inflate.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_inflate.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_inftrees.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_inftrees.c
deleted file mode 100644
index 9abe3f0570..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_inftrees.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_inftrees.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_trees.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_trees.c
deleted file mode 100644
index 05e175b33f..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_trees.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_trees.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_uncompr.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_uncompr.c
deleted file mode 100644
index 451cb6fa85..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_uncompr.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_uncompr.c"
diff --git a/core/src/fxcodec/fx_zlib/src/fx_zlib_zutil.c b/core/src/fxcodec/fx_zlib/src/fx_zlib_zutil.c
deleted file mode 100644
index f97edd50fd..0000000000
--- a/core/src/fxcodec/fx_zlib/src/fx_zlib_zutil.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
- 
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../zlib_v128/fx_zlib_zutil.c"
diff --git a/pdfium.gyp b/pdfium.gyp
index 0e67ef2d35..5fb0225fce 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -332,6 +332,7 @@
         'third_party/third_party.gyp:fx_lcms2',
         'third_party/third_party.gyp:fx_libjpeg',
         'third_party/third_party.gyp:fx_libopenjpeg',
+        'third_party/third_party.gyp:fx_zlib',
       ],
       'ldflags': [ '-L<(PRODUCT_DIR)',],
       'sources': [
@@ -406,21 +407,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',
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index c988e7d8b0..549df8a3ae 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -225,6 +225,31 @@ source_set("fx_libopenjpeg") {
   ]
 }
 
+source_set("fx_zlib") {
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [
+    "//build/config/compiler:no_chromium_code",
+    "//third_party/pdfium:pdfium_config",
+  ]
+  sources = [
+    "zlib_v128/adler32.c",
+    "zlib_v128/compress.c",
+    "zlib_v128/crc32.c",
+    "zlib_v128/deflate.c",
+    "zlib_v128/gzclose.c",
+    "zlib_v128/gzlib.c",
+    "zlib_v128/gzread.c",
+    "zlib_v128/gzwrite.c",
+    "zlib_v128/infback.c",
+    "zlib_v128/inffast.c",
+    "zlib_v128/inflate.c",
+    "zlib_v128/inftrees.c",
+    "zlib_v128/trees.c",
+    "zlib_v128/uncompr.c",
+    "zlib_v128/zutil.c",
+  ]
+}
+
 source_set("pdfium_base") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 240d65bca4..ff657719f6 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -234,6 +234,27 @@
       ],
     },
     {
+      'target_name': 'fx_zlib',
+      'type': 'static_library',
+      'sources': [
+        'zlib_v128/adler32.c',
+        'zlib_v128/compress.c',
+        'zlib_v128/crc32.c',
+        'zlib_v128/deflate.c',
+        'zlib_v128/gzclose.c',
+        'zlib_v128/gzlib.c',
+        'zlib_v128/gzread.c',
+        'zlib_v128/gzwrite.c',
+        'zlib_v128/infback.c',
+        'zlib_v128/inffast.c',
+        'zlib_v128/inflate.c',
+        'zlib_v128/inftrees.c',
+        'zlib_v128/trees.c',
+        'zlib_v128/uncompr.c',
+        'zlib_v128/zutil.c',
+      ],
+    },
+    {
       'target_name': 'pdfium_base',
       'type': 'none',
       'sources': [
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_adler32.c b/third_party/zlib_v128/adler32.c
index 82a84ceed2..82a84ceed2 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_adler32.c
+++ b/third_party/zlib_v128/adler32.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_compress.c b/third_party/zlib_v128/compress.c
index 0314fbc61a..0314fbc61a 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_compress.c
+++ b/third_party/zlib_v128/compress.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_crc32.c b/third_party/zlib_v128/crc32.c
index f0072c94bf..f0072c94bf 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_crc32.c
+++ b/third_party/zlib_v128/crc32.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/crc32.h b/third_party/zlib_v128/crc32.h
index 9e0c778102..9e0c778102 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/crc32.h
+++ b/third_party/zlib_v128/crc32.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_deflate.c b/third_party/zlib_v128/deflate.c
index 1afe233c9a..1afe233c9a 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_deflate.c
+++ b/third_party/zlib_v128/deflate.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/deflate.h b/third_party/zlib_v128/deflate.h
index ce0299edd1..ce0299edd1 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/deflate.h
+++ b/third_party/zlib_v128/deflate.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/gzclose.c b/third_party/zlib_v128/gzclose.c
index 0f010b84c8..0f010b84c8 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/gzclose.c
+++ b/third_party/zlib_v128/gzclose.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/gzguts.h b/third_party/zlib_v128/gzguts.h
index a877c0eee3..a877c0eee3 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/gzguts.h
+++ b/third_party/zlib_v128/gzguts.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/gzlib.c b/third_party/zlib_v128/gzlib.c
index 68b176478d..68b176478d 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/gzlib.c
+++ b/third_party/zlib_v128/gzlib.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/gzread.c b/third_party/zlib_v128/gzread.c
index f162a32f10..f162a32f10 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/gzread.c
+++ b/third_party/zlib_v128/gzread.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/gzwrite.c b/third_party/zlib_v128/gzwrite.c
index 161070866f..161070866f 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/gzwrite.c
+++ b/third_party/zlib_v128/gzwrite.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_infback.c b/third_party/zlib_v128/infback.c
index 157bbd64e9..157bbd64e9 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_infback.c
+++ b/third_party/zlib_v128/infback.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_inffast.c b/third_party/zlib_v128/inffast.c
index 3fcffae498..3fcffae498 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_inffast.c
+++ b/third_party/zlib_v128/inffast.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/inffast.h b/third_party/zlib_v128/inffast.h
index e5c1aa4ca8..e5c1aa4ca8 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/inffast.h
+++ b/third_party/zlib_v128/inffast.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/inffixed.h b/third_party/zlib_v128/inffixed.h
index d628327769..d628327769 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/inffixed.h
+++ b/third_party/zlib_v128/inffixed.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_inflate.c b/third_party/zlib_v128/inflate.c
index bc5e448daf..bc5e448daf 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_inflate.c
+++ b/third_party/zlib_v128/inflate.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/inflate.h b/third_party/zlib_v128/inflate.h
index 95f4986d40..95f4986d40 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/inflate.h
+++ b/third_party/zlib_v128/inflate.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_inftrees.c b/third_party/zlib_v128/inftrees.c
index 05ba1324f4..05ba1324f4 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_inftrees.c
+++ b/third_party/zlib_v128/inftrees.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/inftrees.h b/third_party/zlib_v128/inftrees.h
index baa53a0b1a..baa53a0b1a 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/inftrees.h
+++ b/third_party/zlib_v128/inftrees.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_trees.c b/third_party/zlib_v128/trees.c
index e1fd952046..e1fd952046 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_trees.c
+++ b/third_party/zlib_v128/trees.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/trees.h b/third_party/zlib_v128/trees.h
index 8a09b5803a..8a09b5803a 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/trees.h
+++ b/third_party/zlib_v128/trees.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_uncompr.c b/third_party/zlib_v128/uncompr.c
index d3cb8fe183..d3cb8fe183 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_uncompr.c
+++ b/third_party/zlib_v128/uncompr.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/zconf.h b/third_party/zlib_v128/zconf.h
index 5708a377e0..5708a377e0 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/zconf.h
+++ b/third_party/zlib_v128/zconf.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h b/third_party/zlib_v128/zlib.h
index 2d5812acf1..2d5812acf1 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h
+++ b/third_party/zlib_v128/zlib.h
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_zutil.c b/third_party/zlib_v128/zutil.c
index 02b945f7d8..02b945f7d8 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/fx_zlib_zutil.c
+++ b/third_party/zlib_v128/zutil.c
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/zutil.h b/third_party/zlib_v128/zutil.h
index e4ec2bdd91..f271873ba5 100644
--- a/core/src/fxcodec/fx_zlib/zlib_v128/zutil.h
+++ b/third_party/zlib_v128/zutil.h
@@ -13,7 +13,7 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#include "../../../../include/fxcrt/fx_system.h"		/* XYQ 2007-5-22 */
+#include "../../core/include/fxcrt/fx_system.h"		/* XYQ 2007-5-22 */
 
 #ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))