0010-Fix-TFLite-build-errors-on-linux-when-using-the-syst.patch 6.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129
  1. From 12da2fa8f2d779e2fc14f48de73af79e9040c141 Mon Sep 17 00:00:00 2001
  2. From: Andres Salomon <dilinger@queued.net>
  3. Date: Sun, 31 Jul 2022 19:07:24 -0400
  4. Subject: [PATCH] Fix TFLite build errors on linux when using the system zlib
  5. The commit a3be9805c1601d3fabe1e5adb6b9199c033aa2c5 updated TFLite,
  6. which included the new zip_*_mem_file.* files that include minizip's
  7. ioapi.h. To support that, it also declared that tflite_support depends
  8. on minizip (in third_party/tflite_support/BUILD.gn). However, that's not
  9. enough, and results in a build error when building using the stub linux
  10. zlib build scripts.
  11. Other places that depend on minizip use a longer path to its header
  12. files. For example, chrome/chrome_cleaner/zip_archiver/'s test_support
  13. depends on minizip, and
  14. chrome/chrome_cleaner/zip_archiver/target/zip_archiver_impl.cc
  15. includes "third_party/zlib/contrib/minizip/ioapi.h".
  16. The new tensorflow stuff should do the same, instead of just including
  17. "contrib/minizip/ioapi.h". This patch fixes that, as well as other
  18. places where ioapi.h or zip.h/unzip.h are included without a fuller
  19. path.
  20. ---
  21. .../tensorflow_lite_support/metadata/cc/metadata_extractor.cc | 4 ++--
  22. .../tensorflow_lite_support/metadata/cc/metadata_populator.cc | 4 ++--
  23. .../metadata/cc/utils/zip_readonly_mem_file.cc | 2 +-
  24. .../metadata/cc/utils/zip_readonly_mem_file.h | 2 +-
  25. .../metadata/cc/utils/zip_writable_mem_file.cc | 2 +-
  26. .../metadata/cc/utils/zip_writable_mem_file.h | 2 +-
  27. 6 files changed, 8 insertions(+), 8 deletions(-)
  28. 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
  29. index 2a72338741626..62d0910182877 100644
  30. --- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
  31. +++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
  32. @@ -21,14 +21,14 @@ limitations under the License.
  33. #include "absl/status/status.h" // from @com_google_absl
  34. #include "absl/strings/str_format.h" // from @com_google_absl
  35. #include "absl/strings/string_view.h" // from @com_google_absl
  36. -#include "contrib/minizip/ioapi.h"
  37. -#include "contrib/minizip/unzip.h"
  38. #include "flatbuffers/flatbuffers.h" // from @flatbuffers
  39. #include "tensorflow/lite/schema/schema_generated.h"
  40. #include "tensorflow_lite_support/cc/common.h"
  41. #include "tensorflow_lite_support/cc/port/status_macros.h"
  42. #include "tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h"
  43. #include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
  44. +#include "third_party/zlib/contrib/minizip/ioapi.h"
  45. +#include "third_party/zlib/contrib/minizip/unzip.h"
  46. namespace tflite {
  47. namespace metadata {
  48. 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
  49. index 299ade3e95d54..8e13fa63dafbc 100644
  50. --- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
  51. +++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
  52. @@ -19,8 +19,6 @@ limitations under the License.
  53. #include <cstring>
  54. #include <functional>
  55. -#include "contrib/minizip/ioapi.h"
  56. -#include "contrib/minizip/zip.h"
  57. #include "flatbuffers/flatbuffers.h" // from @flatbuffers
  58. #include "tensorflow/lite/schema/schema_generated.h"
  59. #include "tensorflow_lite_support/cc/common.h"
  60. @@ -28,6 +26,8 @@ limitations under the License.
  61. #include "tensorflow_lite_support/cc/port/statusor.h"
  62. #include "tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h"
  63. #include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
  64. +#include "third_party/zlib/contrib/minizip/ioapi.h"
  65. +#include "third_party/zlib/contrib/minizip/zip.h"
  66. namespace tflite {
  67. namespace metadata {
  68. 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
  69. index 392b6b411fe03..525ae4a2b45bd 100644
  70. --- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
  71. +++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
  72. @@ -19,7 +19,7 @@ limitations under the License.
  73. #include <cstdio>
  74. #include "absl/strings/string_view.h" // from @com_google_absl
  75. -#include "contrib/minizip/ioapi.h"
  76. +#include "third_party/zlib/contrib/minizip/ioapi.h"
  77. namespace tflite {
  78. namespace metadata {
  79. 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
  80. index a1799ff509de5..72413a0a56252 100644
  81. --- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
  82. +++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
  83. @@ -19,7 +19,7 @@ limitations under the License.
  84. #include <cstdlib>
  85. #include "absl/strings/string_view.h" // from @com_google_absl
  86. -#include "contrib/minizip/ioapi.h"
  87. +#include "third_party/zlib/contrib/minizip/ioapi.h"
  88. namespace tflite {
  89. namespace metadata {
  90. 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
  91. index 38ad17ad8935c..3ba91b5e22890 100644
  92. --- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
  93. +++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
  94. @@ -19,7 +19,7 @@ limitations under the License.
  95. #include <cstdio>
  96. #include "absl/strings/string_view.h" // from @com_google_absl
  97. -#include "contrib/minizip/ioapi.h"
  98. +#include "third_party/zlib/contrib/minizip/ioapi.h"
  99. namespace tflite {
  100. namespace metadata {
  101. 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
  102. index 30e42fdb72a31..3d329925df756 100644
  103. --- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
  104. +++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
  105. @@ -19,7 +19,7 @@ limitations under the License.
  106. #include <cstdlib>
  107. #include "absl/strings/string_view.h" // from @com_google_absl
  108. -#include "contrib/minizip/ioapi.h"
  109. +#include "third_party/zlib/contrib/minizip/ioapi.h"
  110. namespace tflite {
  111. namespace metadata {
  112. --
  113. 2.30.2