diff options
| -rw-r--r-- | www-client/chromium/Manifest | 6 | ||||
| -rw-r--r-- | www-client/chromium/chromium-119.0.6045.10.ebuild (renamed from www-client/chromium/chromium-118.0.5979.0.ebuild) | 5 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-119-compiler.patch | 244 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-119-minizip.patch | 147 |
4 files changed, 398 insertions, 4 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d0b39f7..2672c01 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -20,6 +20,8 @@ AUX chromium-118-freetype-blink.patch 554 BLAKE2B 533582b453f2c0f80c8c69aac4dfbd AUX chromium-118-lightweight-detector-include.patch 495 BLAKE2B 604c2264bdae6a3d63d1b80af04d7f46da07fc24f45f11fa398dce54d1edee27d4ffb5ea9e89d04421061a55ed4a29394321c2e9a33090c92b3a6eefef64561a SHA512 ca09cdd8394bfe57a027dcf47d6e457e7e944c2107978eaa8dbc8bb511cbf58ce99d66bafc70e6983b7c249c2e41ee37ab7a2eafb33f78bdf289d99279f63789 AUX chromium-118-material-color-utils.patch 2088 BLAKE2B 9776e46268b427d5ac651a9e509c392e79fe420b569146b4839d22f1b9c524a5626a023dab12b3ff8ec8db2ceb7047a2da1933af168294ce6aaeb437eeafa8dc SHA512 a7934f42f9b2eb3eefe35c2363d28a4d653730f9068f40fb9ee54ee25051be23fbfcda3407743da20b7a2bf36aa6c97ade371ecc6df59c2e739616f4622129c7 AUX chromium-118-sensor-reading-include.patch 539 BLAKE2B 00fa5aa26e6c85ae877e0502f562187924abca0280028ba1ed90b9da9dc01fbdc367c61b4c4ca72e97d6670944622365856cd19f982396c5f12308e0564178bb SHA512 602305b549741b4b512ba43dcc8f69591f1f9462bdd436d6db66f28313f2e574615f7560819ba4374795296bcd8ead6ceebba84df6fece8ab1539aa662d0a2ca +AUX chromium-119-compiler.patch 8514 BLAKE2B 14e1acde8a8e632c88d1f37b913631c54cf948904de74c275b07d522f5d55b9d7a4c661db54fb1f8037bfc1958e68aa799e4befbc8d9c7fc748244760eb10a8b SHA512 2855266bc3d779350ebe361907779149c4713ce49c477039febcfb3d10f81699b8898b1e18eae9fb9eb534b08cc1e44ea762f7ab4524c06fdb7cef2079886433 +AUX chromium-119-minizip.patch 6867 BLAKE2B 50dcf02d6095fc75c2033afba39bae6386e4bf9d34e3a284e6eb1ba949cbe983c4ef546abc4e475f2433d608676d94855103b49bd78916085170e0cb5475ec6e SHA512 6a701b8b34e9b56d1ff03f6cc1c8542568c543299f9b60648cf1aa7d56e5958e293057d3f251634479841724e179733bd3ed2320ee5fbb56e1cb66b8fc7f70fb AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6 @@ -30,8 +32,8 @@ AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 -DIST chromium-118.0.5979.0.tar.xz 3226425672 BLAKE2B 564a9f93a2b2d8fbebad10bb927e0242d717aadaa79e6966350cc0fda2fe0b7d5a45ca14266b0f915c49abf36292f4d87b4ab6b8756b675a2b0ee991cee2bf76 SHA512 44669ccf32651085d4f3df5dce24f302a6f06c8fb1267ebd9fdd06eae5b68964df4c20680f1dc8fd465616d5c66e41a36e953d5987dbeac87a52fdb4a0c35953 DIST chromium-118.0.5993.11.tar.xz 3223953784 BLAKE2B 6760cf3b0a1e52b84879e9d60043eebcf8c1066811d2062f85f23e3ebafcb87e585564175ec1848d9c2bb745c91764c2bed5ba5afaa72aa9670d586bcef444b3 SHA512 589ffd416d8e9d485256f980f84c19afa698e287bb6eb9831fa94250f9ba400c1af003d445076791f735f2d629a80dbaa939738dfd6794ae023383708af4f87b +DIST chromium-119.0.6045.10.tar.xz 3276428548 BLAKE2B 724bb65bb965aa838ae4127affdc71a61a33e5786209151fcfec6d5678905bde9679a0767becd2c3f155d5c6c713e5a011541be00f04ccb55432880e996cc671 SHA512 61ec60f1cf779e5fd6dc45f4f375be2b0b55bc623f75c192e6930d19bb93be63e2c9d736db8660216cc550567732ea728804847376e3b3d402e27b140b9c2a78 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c -EBUILD chromium-118.0.5979.0.ebuild 38633 BLAKE2B 44d2f0de1b01fcb40d52d61b34efcfa4c561f65f3ad34ec70589ad2b60cdc1f11e32bdae3115beaa86be9aa38170aad3652e18b9e3b15dd756ea969c66b72d3b SHA512 cabd64377446791ee4b195d1c794811cb57f2138478bda24df01d55573d0fa47f52df5e19f037949bcd21a632c6fdb65c9c37d2e1069b027c06422c4916e6cea EBUILD chromium-118.0.5993.11.ebuild 38755 BLAKE2B 2e7208e68cc6f533f11a5ae373e4a7cec6499b0e0eb3855b79571632fcc3a1b7d1b941c012e37012891ee47690a1b002ce67e343d262b775575b01a530cdc5b1 SHA512 dff658e4e79940c3b772df32be564fbe54f01fde68f071e811e70a21562152f1b31271bb819bcebf2ab164996786a5f035c559921f6b9ea8470e016921a46fe2 +EBUILD chromium-119.0.6045.10.ebuild 38697 BLAKE2B 9aec4243be0e0c11487ab914d782eb3d3682c8d2ebef785bff306fbf060947bfe6aa47ce94b0fddc5ffd97630f4d1f7e31928c6e6999cf7fe1e8a3de4e9e8365 SHA512 8cafe8ba4ae11e34bd5a21ea77f2a1aa23469ea630ec4ae5fe1c2b61ed7964eaa37be87c108edfdac763b1ca9614c15cda1d0bf10e2456ec3765d0be9377b3bf diff --git a/www-client/chromium/chromium-118.0.5979.0.ebuild b/www-client/chromium/chromium-119.0.6045.10.ebuild index 3d42de5..c5f11fc 100644 --- a/www-client/chromium/chromium-118.0.5979.0.ebuild +++ b/www-client/chromium/chromium-119.0.6045.10.ebuild @@ -318,13 +318,14 @@ src_prepare() { local PATCHES=( "${FILESDIR}/chromium-105-protobuf-RepeatedPtrField-export.patch" - "${FILESDIR}/chromium-118-compiler.patch" + "${FILESDIR}/chromium-119-compiler.patch" "${FILESDIR}/chromium-114-VirtualCursor-std-layout.patch" - "${FILESDIR}/chromium-109-minizip.patch" + "${FILESDIR}/chromium-119-minizip.patch" "${FILESDIR}/chromium-113-authenticator-request-dialog-model-include.patch" "${FILESDIR}/chromium-118-blink-buildgn.patch" "${FILESDIR}/chromium-118-material-color-utils.patch" "${FILESDIR}/chromium-118-freetype-blink.patch" + "${FILESDIR}/chromium-118-lightweight-detector-include.patch" "${FILESDIR}/chromium-111-InkDropHost-crash.patch" "${FILESDIR}/chromium-109-EnumTable-crash.patch" diff --git a/www-client/chromium/files/chromium-119-compiler.patch b/www-client/chromium/files/chromium-119-compiler.patch new file mode 100644 index 0000000..753cf51 --- /dev/null +++ b/www-client/chromium/files/chromium-119-compiler.patch @@ -0,0 +1,244 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 6d05512ae3..af9e7ccfcc 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -314,9 +314,7 @@ config("compiler") { + + configs += [ + # See the definitions below. +- ":clang_revision", + ":rustc_revision", +- ":compiler_cpu_abi", + ":compiler_codegen", + ":compiler_deterministic", + ] +@@ -582,37 +580,6 @@ config("compiler") { + ldflags += [ "-Wl,-z,keep-text-section-prefix" ] + } + +- if (is_clang && !is_nacl && current_os != "zos") { +- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] +- if (save_reproducers_on_lld_crash && use_lld) { +- ldflags += [ +- "-fcrash-diagnostics=all", +- "-fcrash-diagnostics-dir=" + clang_diagnostic_dir, +- ] +- } +- +- # TODO(hans): Remove this once Clang generates better optimized debug info +- # by default. https://crbug.com/765793 +- cflags += [ +- "-mllvm", +- "-instcombine-lower-dbg-declare=0", +- ] +- if (!is_debug && use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ] +- } +- } +- +- # TODO(crbug.com/1235145): Investigate why/if this should be needed. +- if (is_win) { +- cflags += [ "/clang:-ffp-contract=off" ] +- } else { +- cflags += [ "-ffp-contract=off" ] +- } +- } +- + # C11/C++11 compiler flags setup. + # --------------------------- + if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) || +@@ -1476,46 +1443,6 @@ config("compiler_deterministic") { + } + } + +- # Makes builds independent of absolute file path. +- if (is_clang && strip_absolute_paths_from_debug_symbols) { +- # If debug option is given, clang includes $cwd in debug info by default. +- # For such build, this flag generates reproducible obj files even we use +- # different build directory like "out/feature_a" and "out/feature_b" if +- # we build same files with same compile flag. +- # Other paths are already given in relative, no need to normalize them. +- if (is_nacl) { +- # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. +- cflags += [ +- "-Xclang", +- "-fdebug-compilation-dir", +- "-Xclang", +- ".", +- ] +- } else { +- # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= +- # and -fcoverage-compilation-dir=. +- cflags += [ "-ffile-compilation-dir=." ] +- swiftflags += [ "-file-compilation-dir=." ] +- } +- if (!is_win) { +- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) +- asmflags = [ "-Wa,-fdebug-compilation-dir,." ] +- } +- +- if (is_win && use_lld) { +- if (symbol_level == 2 || (is_clang && using_sanitizer)) { +- # Absolutize source file paths for PDB. Pass the real build directory +- # if the pdb contains source-level debug information and if linker +- # reproducibility is not critical. +- ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ] +- } else { +- # Use a fake fixed base directory for paths in the pdb to make the pdb +- # output fully deterministic and independent of the build directory. +- ldflags += [ "/PDBSourcePath:o:\fake\prefix" ] +- } +- } +- } +- + # Tells the compiler not to use absolute paths when passing the default + # paths to the tools it invokes. We don't want this because we don't + # really need it and it can mess up the goma cache entries. +@@ -1534,26 +1461,7 @@ config("compiler_deterministic") { + } + } + +-config("clang_revision") { +- if (is_clang && clang_base_path == default_clang_base_path) { +- update_args = [ +- "--print-revision", +- "--verify-version=$clang_version", +- ] +- if (llvm_force_head_revision) { +- update_args += [ "--llvm-force-head-revision" ] +- } +- clang_revision = exec_script("//tools/clang/scripts/update.py", +- update_args, +- "trim string") +- +- # This is here so that all files get recompiled after a clang roll and +- # when turning clang on or off. (defines are passed via the command line, +- # and build system rebuild things when their commandline changes). Nothing +- # should ever read this define. +- defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] +- } +-} ++config("clang_revision") { } + + config("rustc_revision") { + if (rustc_revision != "") { +@@ -1916,11 +1824,7 @@ config("chromium_code") { + defines = [ "_HAS_NODISCARD" ] + } + } else { +- cflags = [ "-Wall" ] +- if (is_clang) { +- # Enable extra warnings for chromium_code when we control the compiler. +- cflags += [ "-Wextra" ] +- } ++ cflags = [ ] + + # In Chromium code, we define __STDC_foo_MACROS in order to get the + # C99 macros on Mac and Linux. +@@ -1929,23 +1833,6 @@ config("chromium_code") { + "__STDC_FORMAT_MACROS", + ] + +- if (!is_debug && !using_sanitizer && current_cpu != "s390x" && +- current_cpu != "s390" && current_cpu != "ppc64" && +- current_cpu != "mips" && current_cpu != "mips64" && +- current_cpu != "riscv64" && current_cpu != "loong64") { +- # Non-chromium code is not guaranteed to compile cleanly with +- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are +- # disabled, so only do that for Release build. +- fortify_level = "2" +- +- # ChromeOS supports a high-quality _FORTIFY_SOURCE=3 implementation +- # with a few custom glibc patches. Use that if it's available. +- if (is_chromeos_ash) { +- fortify_level = "3" +- } +- defines += [ "_FORTIFY_SOURCE=" + fortify_level ] +- } +- + if (is_apple) { + cflags_objc = [ "-Wimplicit-retain-self" ] + cflags_objcc = [ "-Wimplicit-retain-self" ] +@@ -2324,7 +2211,8 @@ config("default_stack_frames") { + } + + # Default "optimization on" config. +-config("optimize") { ++config("optimize") { } ++config("xoptimize") { + if (is_win) { + if (chrome_pgo_phase != 2) { + # Favor size over speed, /O1 must be before the common flags. +@@ -2383,7 +2271,8 @@ config("optimize") { + } + + # Turn off optimizations. +-config("no_optimize") { ++config("no_optimize") { } ++config("xno_optimize") { + if (is_win) { + cflags = [ + "/Od", # Disable optimization. +@@ -2423,7 +2312,8 @@ config("no_optimize") { + # Turns up the optimization level. On Windows, this implies whole program + # optimization and link-time code generation which is very expensive and should + # be used sparingly. +-config("optimize_max") { ++config("optimize_max") { } ++config("xoptimize_max") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2456,7 +2346,8 @@ config("optimize_max") { + # + # TODO(crbug.com/621335) - rework how all of these configs are related + # so that we don't need this disclaimer. +-config("optimize_speed") { ++config("optimize_speed") { } ++config("xoptimize_speed") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2482,7 +2373,8 @@ config("optimize_speed") { + } + } + +-config("optimize_fuzzing") { ++config("optimize_fuzzing") { } ++config("xoptimize_fuzzing") { + cflags = [ "-O1" ] + common_optimize_on_cflags + rustflags = [ "-Copt-level=1" ] + ldflags = common_optimize_on_ldflags +@@ -2615,7 +2507,8 @@ config("win_pdbaltpath") { + } + + # Full symbols. +-config("symbols") { ++config("symbols") { } ++config("xsymbols") { + rustflags = [] + if (is_win) { + if (is_clang) { +@@ -2764,7 +2657,8 @@ config("symbols") { + # Minimal symbols. + # This config guarantees to hold symbol for stack trace which are shown to user + # when crash happens in unittests running on buildbot. +-config("minimal_symbols") { ++config("minimal_symbols") { } ++config("xminimal_symbols") { + rustflags = [] + if (is_win) { + # Functions, files, and line tables only. +@@ -2849,7 +2743,8 @@ config("minimal_symbols") { + # This configuration contains function names only. That is, the compiler is + # told to not generate debug information and the linker then just puts function + # names in the final debug information. +-config("no_symbols") { ++config("no_symbols") { } ++config("xno_symbols") { + if (is_win) { + ldflags = [ "/DEBUG" ] + diff --git a/www-client/chromium/files/chromium-119-minizip.patch b/www-client/chromium/files/chromium-119-minizip.patch new file mode 100644 index 0000000..be7df19 --- /dev/null +++ b/www-client/chromium/files/chromium-119-minizip.patch @@ -0,0 +1,147 @@ +diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc +index 4b3f816183..7da8b9fb89 100644 +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc +@@ -28,8 +28,8 @@ limitations under the License. + #include "tensorflow_lite_support/cc/port/status_macros.h" + #include "tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h" + #include "tensorflow_lite_support/metadata/metadata_schema_generated.h" +-#include "third_party/zlib/contrib/minizip/ioapi.h" +-#include "third_party/zlib/contrib/minizip/unzip.h" ++#include "minizip/ioapi.h" ++#include "minizip/unzip.h" + + + namespace tflite { +diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc +index 01c68515af..7a53974f2a 100644 +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc +@@ -26,8 +26,8 @@ limitations under the License. + #include "tensorflow_lite_support/cc/port/statusor.h" + #include "tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h" + #include "tensorflow_lite_support/metadata/metadata_schema_generated.h" +-#include "third_party/zlib/contrib/minizip/ioapi.h" +-#include "third_party/zlib/contrib/minizip/unzip.h" ++#include "minizip/ioapi.h" ++#include "minizip/unzip.h" + + namespace tflite { + namespace metadata { +diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc +index 65a4638a86..ad4925fe03 100644 +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc +@@ -19,7 +19,7 @@ limitations under the License. + #include <cstdio> + + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "third_party/zlib/contrib/minizip/ioapi.h" ++#include "minizip/ioapi.h" + + namespace tflite { + namespace metadata { +diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h +index 1b7bed5987..e978c66e92 100644 +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h +@@ -19,7 +19,7 @@ limitations under the License. + #include <cstdlib> + + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "third_party/zlib/contrib/minizip/ioapi.h" ++#include "minizip/ioapi.h" + + namespace tflite { + namespace metadata { +diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc +index 73e42b8443..1556009def 100644 +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc +@@ -19,7 +19,7 @@ limitations under the License. + #include <cstdio> + + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "third_party/zlib/contrib/minizip/ioapi.h" ++#include "minizip/ioapi.h" + + namespace tflite { + namespace metadata { +diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h +index bb27d96aef..84a4719546 100644 +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h +@@ -19,7 +19,7 @@ limitations under the License. + #include <cstdlib> + + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "third_party/zlib/contrib/minizip/ioapi.h" ++#include "minizip/ioapi.h" + + namespace tflite { + namespace metadata { +diff --git a/third_party/zlib/google/zip_internal.cc b/third_party/zlib/google/zip_internal.cc +index b9976d63ee..378bc04632 100644 +--- a/third_party/zlib/google/zip_internal.cc ++++ b/third_party/zlib/google/zip_internal.cc +@@ -17,7 +17,7 @@ + #include "base/strings/string_util.h" + #include "base/strings/utf_string_conversions.h" + +-#if defined(USE_SYSTEM_MINIZIP) ++#if 1//defined(USE_SYSTEM_MINIZIP) + #include <minizip/ioapi.h> + #include <minizip/unzip.h> + #include <minizip/zip.h> +diff --git a/third_party/zlib/google/zip_internal.h b/third_party/zlib/google/zip_internal.h +index f107d7fe88..28ef2f6360 100644 +--- a/third_party/zlib/google/zip_internal.h ++++ b/third_party/zlib/google/zip_internal.h +@@ -14,7 +14,7 @@ + #include <windows.h> + #endif + +-#if defined(USE_SYSTEM_MINIZIP) ++#if 1//defined(USE_SYSTEM_MINIZIP) + #include <minizip/unzip.h> + #include <minizip/zip.h> + #else +diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc +index 34a815e5f5..74ed759d57 100644 +--- a/third_party/zlib/google/zip_reader.cc ++++ b/third_party/zlib/google/zip_reader.cc +@@ -23,7 +23,7 @@ + #include "third_party/zlib/google/redact.h" + #include "third_party/zlib/google/zip_internal.h" + +-#if defined(USE_SYSTEM_MINIZIP) ++#if 1//defined(USE_SYSTEM_MINIZIP) + #include <minizip/unzip.h> + #else + #include "third_party/zlib/contrib/minizip/unzip.h" +diff --git a/third_party/zlib/google/zip_reader.h b/third_party/zlib/google/zip_reader.h +index b7680cc839..d303ef471b 100644 +--- a/third_party/zlib/google/zip_reader.h ++++ b/third_party/zlib/google/zip_reader.h +@@ -18,7 +18,7 @@ + #include "base/numerics/safe_conversions.h" + #include "base/time/time.h" + +-#if defined(USE_SYSTEM_MINIZIP) ++#if 1//defined(USE_SYSTEM_MINIZIP) + #include <minizip/unzip.h> + #else + #include "third_party/zlib/contrib/minizip/unzip.h" +diff --git a/third_party/zlib/google/zip_writer.h b/third_party/zlib/google/zip_writer.h +index dd109293da..edb1542b78 100644 +--- a/third_party/zlib/google/zip_writer.h ++++ b/third_party/zlib/google/zip_writer.h +@@ -13,7 +13,7 @@ + #include "build/build_config.h" + #include "third_party/zlib/google/zip.h" + +-#if defined(USE_SYSTEM_MINIZIP) ++#if 1//defined(USE_SYSTEM_MINIZIP) + #include <minizip/unzip.h> + #include <minizip/zip.h> + #else |