1
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2
From: Felix Hanau <felix@cloudflare.com>
3
Date: Sun, 8 Jun 2025 16:40:37 -0400
4
Subject: Port V8_USE_ZLIB support
5
 
6
Change-Id: Icfedf3e90522f1ff5037517a39a5f0e3d44abace
7
 
8
diff --git a/BUILD.bazel b/BUILD.bazel
9
index 71db68eef5cce90ec721dabdef446aee224bce9a..42ed7c61f0a5bcb5316e624e8c5b29c19d355970 100644
10
--- a/BUILD.bazel
11
+++ b/BUILD.bazel
12
@@ -162,6 +162,11 @@ v8_flag(name = "v8_enable_verify_predictable")
13
 
14
 v8_flag(name = "v8_enable_test_features")
15
 
16
+v8_flag(
17
+    name = "v8_use_zlib",
18
+    default = True,
19
+)
20
+
21
 v8_flag(name = "v8_wasm_random_fuzzers")
22
 
23
 v8_flag(
24
@@ -533,6 +538,7 @@ v8_config(
25
         "v8_enable_vtunejit": "ENABLE_VTUNE_JIT_INTERFACE",
26
         "v8_enable_undefined_double": "V8_ENABLE_UNDEFINED_DOUBLE",
27
         "v8_use_host_cpu_arm_features": "V8_USE_HOST_CPU_ARM_FEATURES",
28
+        "v8_use_zlib": "V8_USE_ZLIB",
29
     },
30
     defines = [
31
         "GOOGLE3",
32
@@ -4676,6 +4682,8 @@ v8_library(
33
         "@highway//:hwy",
34
         "@fast_float",
35
         "@simdutf",
36
+        "@zlib",
37
+        "@zlib//:compression_utils_portable",
38
     ],
39
 )
40
 
41
diff --git a/src/deoptimizer/frame-translation-builder.cc b/src/deoptimizer/frame-translation-builder.cc
42
index 497f11e5cd2c20b33b86a71615fb12e48c32048f..b2bbe6aca39bec6299551be0932eda89034775e8 100644
43
--- a/src/deoptimizer/frame-translation-builder.cc
44
+++ b/src/deoptimizer/frame-translation-builder.cc
45
@@ -11,7 +11,7 @@
46
 #include "src/objects/fixed-array-inl.h"
47
 
48
 #ifdef V8_USE_ZLIB
49
-#include "third_party/zlib/google/compression_utils_portable.h"
50
+#include <google/compression_utils_portable.h>
51
 #endif  // V8_USE_ZLIB
52
 
53
 namespace v8 {
54
diff --git a/src/objects/deoptimization-data.cc b/src/objects/deoptimization-data.cc
55
index db3b6ee16e17c8eb0c338e76054dc59c08967c24..be26237d335be4cde756f147940227262f6917ed 100644
56
--- a/src/objects/deoptimization-data.cc
57
+++ b/src/objects/deoptimization-data.cc
58
@@ -14,7 +14,7 @@
59
 #include "src/objects/shared-function-info.h"
60
 
61
 #ifdef V8_USE_ZLIB
62
-#include "third_party/zlib/google/compression_utils_portable.h"
63
+#include <google/compression_utils_portable.h>
64
 #endif  // V8_USE_ZLIB
65
 
66
 namespace v8 {
67
diff --git a/src/snapshot/snapshot-utils.cc b/src/snapshot/snapshot-utils.cc
68
index ea04fcec0ecebd409d1ed9839dd0db3ac73160a9..e67eb478a0f49fa2a6c4f338e86a7e6a5e6d686f 100644
69
--- a/src/snapshot/snapshot-utils.cc
70
+++ b/src/snapshot/snapshot-utils.cc
71
@@ -7,7 +7,7 @@
72
 #include "src/base/sanitizer/msan.h"
73
 
74
 #ifdef V8_USE_ZLIB
75
-#include "third_party/zlib/zlib.h"
76
+#include <zlib.h>
77
 #endif
78
 
79
 namespace v8 {