parent
24a34d44c8
commit
7187ed89f5
@ -1,65 +0,0 @@
|
|||||||
diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
|
|
||||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip 2023-11-06 12:42:34.928657960 +0100
|
|
||||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc 2023-11-06 12:51:12.547834851 +0100
|
|
||||||
@@ -28,9 +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 {
|
|
||||||
namespace metadata {
|
|
||||||
diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
|
|
||||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100
|
|
||||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc 2023-11-06 12:42:34.928657960 +0100
|
|
||||||
@@ -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/zip.h>
|
|
||||||
|
|
||||||
namespace tflite {
|
|
||||||
namespace metadata {
|
|
||||||
diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
|
|
||||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100
|
|
||||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc 2023-11-06 12:42:34.929657982 +0100
|
|
||||||
@@ -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 -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
|
|
||||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100
|
|
||||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc 2023-11-06 12:42:34.929657982 +0100
|
|
||||||
@@ -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 -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
|
|
||||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip 2023-11-01 19:11:24.000000000 +0100
|
|
||||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h 2023-11-06 12:42:34.929657982 +0100
|
|
||||||
@@ -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 {
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -up chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn
|
|
||||||
--- chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib 2020-04-13 12:25:09.001172601 -0400
|
|
||||||
+++ chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn 2020-04-13 12:25:23.688921586 -0400
|
|
||||||
@@ -294,7 +294,7 @@ if (enable_perfetto_zlib) {
|
|
||||||
public_configs = [ "//buildtools:zlib_config" ]
|
|
||||||
public_deps = [ "//buildtools:zlib" ]
|
|
||||||
} else {
|
|
||||||
- public_configs = [ "//third_party/zlib:zlib_config" ]
|
|
||||||
+ public_configs = [ "//third_party/zlib:system_zlib" ]
|
|
||||||
public_deps = [ "//third_party/zlib" ]
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in new issue