commit fa957e7a4e58c7da019ce693eb832935b3450ebb
author Lalit Maganti <lalitm@google.com> Thu Mar 16 18:22:23 2023 +0000
committer Lalit Maganti <lalitm@google.com> Thu Mar 16 18:22:23 2023 +0000
tree 9417dfb851da744e0609685c9be8c6ea13955dc5
parent 47c1e7fe0ebb4a9171f48d4dbae848a390b9a01d

perfetto: bump zlib version

Bump to match Chromium deps: this should stop the flakes on the Perfetto
CI.

Change-Id: Icc77c1469c5e7f7c5393a16405bed00261040ed1

bazel/deps.bzl

diff --git a/bazel/deps.bzl b/bazel/deps.bzl
index 0b63d8c..f830520 100644
--- a/bazel/deps.bzl
+++ b/bazel/deps.bzl
@@ -72,9 +72,9 @@
         new_git_repository,
         name = "perfetto_dep_zlib",
         remote = "https://android.googlesource.com/platform/external/zlib.git",
-        commit = "5c85a2da4c13eda07f69d81a1579a5afddd35f59",
+        commit = "6d3f6aa0f87c9791ca7724c279ef61384f331dfd",
         build_file = "//bazel:zlib.BUILD",
-        shallow_since = "1605147005 +0000",
+        shallow_since = "1678405807 -0800",
     )
 
     _add_repo_if_not_existing(

bazel/zlib.BUILD

diff --git a/bazel/zlib.BUILD b/bazel/zlib.BUILD
index 9c203dd..5e2ac5b 100644
--- a/bazel/zlib.BUILD
+++ b/bazel/zlib.BUILD
@@ -18,6 +18,7 @@
     name = "zlib",
     srcs = [
         "adler32.c",
+        "chromeconf.h",
         "compress.c",
         "contrib/optimizations/insert_string.h",
         "cpu_features.c",
@@ -43,13 +44,9 @@
         "trees.h",
         "uncompr.c",
         "zconf.h",
-        "zlib.h",
         "zutil.c",
         "zutil.h",
-    ] + select({
-      "@perfetto//bazel:cpu_arm64": ["contrib/optimizations/slide_hash_neon.h"],
-      "//conditions:default": [],
-    }),
+    ],
     hdrs = [
         "zlib.h",
     ],
@@ -58,7 +55,8 @@
       "//conditions:default": [],
     }) + [
         "-Wno-unused-function",
-        "-DHAVE_HIDDEN",
+        "-DZLIB_IMPLEMENTATION",
+        "-DCHROMIUM_ZLIB_NO_CHROMECONF",
     ] + PERFETTO_CONFIG.deps_copts.zlib,
     includes = ["zlib"],
     visibility = ["//visibility:public"],