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 #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 #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 #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 #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 #include #include 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 #endif -#if defined(USE_SYSTEM_MINIZIP) +#if 1//defined(USE_SYSTEM_MINIZIP) #include #include #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 #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 #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 #include #else