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

Android.bp

diff --git a/Android.bp b/Android.bp
index 4502a31..65e21a7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1079,7 +1079,7 @@
         "perfetto_defaults",
     ],
     cflags: [
-        "-DHAVE_HIDDEN",
+        "-DZLIB_IMPLEMENTATION",
     ],
 }
 
@@ -2230,7 +2230,7 @@
     cflags: [
         "-DGOOGLE_PROTOBUF_NO_RTTI",
         "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
-        "-DHAVE_HIDDEN",
+        "-DZLIB_IMPLEMENTATION",
     ],
     header_libs: [
         "bionic_libc_platform_headers",
@@ -11871,7 +11871,7 @@
     cflags: [
         "-DGOOGLE_PROTOBUF_NO_RTTI",
         "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
-        "-DHAVE_HIDDEN",
+        "-DZLIB_IMPLEMENTATION",
     ],
     include_dirs: [
         "bionic/libc/kernel",
@@ -12382,7 +12382,7 @@
     cflags: [
         "-DGOOGLE_PROTOBUF_NO_RTTI",
         "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
-        "-DHAVE_HIDDEN",
+        "-DZLIB_IMPLEMENTATION",
     ],
     strip: {
         all: true,
@@ -12603,7 +12603,7 @@
         "perfetto_defaults",
     ],
     cflags: [
-        "-DHAVE_HIDDEN",
+        "-DZLIB_IMPLEMENTATION",
     ],
     target: {
         musl: {