--- chromium-90.0.4430.19/third_party/angle/src/libANGLE/BlobCache.cpp.gcc10	2021-03-09 19:42:36.000000000 +0100
+++ chromium-90.0.4430.19/third_party/angle/src/libANGLE/BlobCache.cpp	2021-03-15 18:24:24.308818048 +0100
@@ -14,7 +14,9 @@
 #include "libANGLE/histogram_macros.h"
 #include "platform/PlatformMethods.h"
 
+#ifndef USE_SYSTEM_ZLIB
 #define USE_SYSTEM_ZLIB
+#endif
 #include "compression_utils_portable.h"
 
 namespace egl
--- chromium-87.0.4280.40/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp.system-zlib	2020-10-29 23:31:51.000000000 +0100
+++ chromium-87.0.4280.40/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp	2020-10-31 12:45:44.809814951 +0100
@@ -10,7 +10,9 @@
 
 #include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h"
 
+#ifndef USE_SYSTEM_ZLIB
 #define USE_SYSTEM_ZLIB
+#endif
 #include "compression_utils_portable.h"
 
 namespace rx
--- chromium-87.0.4280.40/third_party/angle/src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py.system-zlib	2020-10-29 23:31:51.000000000 +0100
+++ chromium-87.0.4280.40/third_party/angle/src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py	2020-10-31 12:41:12.681773748 +0100
@@ -40,7 +40,9 @@ template_shader_library_cpp = u"""// GEN
 
 #include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h"
 
+#ifndef USE_SYSTEM_ZLIB
 #define USE_SYSTEM_ZLIB
+#endif
 #include "compression_utils_portable.h"
 
 namespace rx
--- chromium-94.0.4606.20/third_party/angle/src/libANGLE/MemoryProgramCache.cpp.system-zlib	2021-08-25 21:15:34.000000000 +0200
+++ chromium-94.0.4606.20/third_party/angle/src/libANGLE/MemoryProgramCache.cpp	2021-09-02 21:10:35.808262303 +0200
@@ -8,7 +8,9 @@
 //   layer to warm up the cache from disk.
 
 // Include zlib first, otherwise FAR gets defined elsewhere.
+#ifndef USE_SYSTEM_ZLIB
 #define USE_SYSTEM_ZLIB
+#endif
 #include "compression_utils_portable.h"
 
 #include "libANGLE/MemoryProgramCache.h"
--- patch/third_party/angle/src/libANGLE/capture/FrameCapture.cpp	2022-09-01 22:36:17.914591000 +0200
+++ patch/third_party/angle/src/libANGLE/capture/FrameCapture.cpp.use-system-zlib	2022-09-05 12:31:23.912650156 +0200
@@ -47,7 +47,9 @@
 #include "libANGLE/validationEGL.h"
 #include "third_party/ceval/ceval.h"
 
+#ifndef USE_SYSTEM_ZLIB
 #define USE_SYSTEM_ZLIB
+#endif
 #include "compression_utils_portable.h"
 
 #if !ANGLE_CAPTURE_ENABLED
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" ]
     }
   }
diff -up chromium-77.0.3865.75/third_party/zlib/zconf.h.nozmangle chromium-77.0.3865.75/third_party/zlib/zconf.h
--- chromium-77.0.3865.75/third_party/zlib/zconf.h.nozmangle	2019-09-12 09:36:37.924086850 +0200
+++ chromium-77.0.3865.75/third_party/zlib/zconf.h	2019-09-12 09:53:01.623958551 +0200
@@ -9,18 +9,6 @@
 #define ZCONF_H

 /*
- * This library is also built as a part of AOSP, which does not need to include
- * chromeconf.h. This config does not want chromeconf.h, so it can set this
- * macro to opt out. While this works today, there's no guarantee that building
- * zlib outside of Chromium keeps working in the future.
- */
-#if !defined(CHROMIUM_ZLIB_NO_CHROMECONF)
-/* This include does prefixing as below, but with an updated set of names.  Also
- * sets up export macros in component builds. */
-#include "chromeconf.h"
-#endif
-
-/*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
  * Even better than compiling with -DZ_PREFIX would be to use configure to set