Update makefiles after merge of Chromium at 37.0.2062.10

This commit was generated by merge_from_chromium.py.

Change-Id: I8c1e034c1674e24c2bb69aaf83756623ab8945f4
diff --git a/tools/gyp/mksnapshot.host.darwin-arm.mk b/tools/gyp/mksnapshot.host.darwin-arm.mk
index 1d9f066..a2cb1d2 100644
--- a/tools/gyp/mksnapshot.host.darwin-arm.mk
+++ b/tools/gyp/mksnapshot.host.darwin-arm.mk
@@ -168,8 +168,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-arm64.mk b/tools/gyp/mksnapshot.host.darwin-arm64.mk
index c720b61..f7c2c32 100644
--- a/tools/gyp/mksnapshot.host.darwin-arm64.mk
+++ b/tools/gyp/mksnapshot.host.darwin-arm64.mk
@@ -164,8 +164,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-mips.mk b/tools/gyp/mksnapshot.host.darwin-mips.mk
index fccd75c..03fba33 100644
--- a/tools/gyp/mksnapshot.host.darwin-mips.mk
+++ b/tools/gyp/mksnapshot.host.darwin-mips.mk
@@ -172,8 +172,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-x86.mk b/tools/gyp/mksnapshot.host.darwin-x86.mk
index 0b1f836..ae830fe 100644
--- a/tools/gyp/mksnapshot.host.darwin-x86.mk
+++ b/tools/gyp/mksnapshot.host.darwin-x86.mk
@@ -164,8 +164,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-x86_64.mk b/tools/gyp/mksnapshot.host.darwin-x86_64.mk
index 7999ffc..01a2972 100644
--- a/tools/gyp/mksnapshot.host.darwin-x86_64.mk
+++ b/tools/gyp/mksnapshot.host.darwin-x86_64.mk
@@ -164,8 +164,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-arm.mk b/tools/gyp/mksnapshot.host.linux-arm.mk
index 6ca1bed..c36cb49 100644
--- a/tools/gyp/mksnapshot.host.linux-arm.mk
+++ b/tools/gyp/mksnapshot.host.linux-arm.mk
@@ -170,8 +170,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-arm64.mk b/tools/gyp/mksnapshot.host.linux-arm64.mk
index c294369..85bb90b 100644
--- a/tools/gyp/mksnapshot.host.linux-arm64.mk
+++ b/tools/gyp/mksnapshot.host.linux-arm64.mk
@@ -166,8 +166,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-mips.mk b/tools/gyp/mksnapshot.host.linux-mips.mk
index 3b45fb4..0de76a4 100644
--- a/tools/gyp/mksnapshot.host.linux-mips.mk
+++ b/tools/gyp/mksnapshot.host.linux-mips.mk
@@ -174,8 +174,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-x86.mk b/tools/gyp/mksnapshot.host.linux-x86.mk
index db2967e..dd86e8b 100644
--- a/tools/gyp/mksnapshot.host.linux-x86.mk
+++ b/tools/gyp/mksnapshot.host.linux-x86.mk
@@ -166,8 +166,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-x86_64.mk b/tools/gyp/mksnapshot.host.linux-x86_64.mk
index f59d483..8464ad7 100644
--- a/tools/gyp/mksnapshot.host.linux-x86_64.mk
+++ b/tools/gyp/mksnapshot.host.linux-x86_64.mk
@@ -166,8 +166,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-arm.mk b/tools/gyp/v8_base.host.darwin-arm.mk
index 7eaaf33..79110eb 100644
--- a/tools/gyp/v8_base.host.darwin-arm.mk
+++ b/tools/gyp/v8_base.host.darwin-arm.mk
@@ -339,8 +339,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-arm64.mk b/tools/gyp/v8_base.host.darwin-arm64.mk
index 2fe403f..84c2f9a 100644
--- a/tools/gyp/v8_base.host.darwin-arm64.mk
+++ b/tools/gyp/v8_base.host.darwin-arm64.mk
@@ -338,8 +338,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-mips.mk b/tools/gyp/v8_base.host.darwin-mips.mk
index fba800f..08c2b92 100644
--- a/tools/gyp/v8_base.host.darwin-mips.mk
+++ b/tools/gyp/v8_base.host.darwin-mips.mk
@@ -343,8 +343,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-x86.mk b/tools/gyp/v8_base.host.darwin-x86.mk
index 22e79d6..272b8c6 100644
--- a/tools/gyp/v8_base.host.darwin-x86.mk
+++ b/tools/gyp/v8_base.host.darwin-x86.mk
@@ -333,8 +333,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-x86_64.mk b/tools/gyp/v8_base.host.darwin-x86_64.mk
index 837bd68..ccccf5a 100644
--- a/tools/gyp/v8_base.host.darwin-x86_64.mk
+++ b/tools/gyp/v8_base.host.darwin-x86_64.mk
@@ -333,8 +333,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-arm.mk b/tools/gyp/v8_base.host.linux-arm.mk
index 823c2bd..32631ad 100644
--- a/tools/gyp/v8_base.host.linux-arm.mk
+++ b/tools/gyp/v8_base.host.linux-arm.mk
@@ -343,8 +343,7 @@
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-arm64.mk b/tools/gyp/v8_base.host.linux-arm64.mk
index ac09f82..7b87295 100644
--- a/tools/gyp/v8_base.host.linux-arm64.mk
+++ b/tools/gyp/v8_base.host.linux-arm64.mk
@@ -342,8 +342,7 @@
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-mips.mk b/tools/gyp/v8_base.host.linux-mips.mk
index d91197a..35b56cf 100644
--- a/tools/gyp/v8_base.host.linux-mips.mk
+++ b/tools/gyp/v8_base.host.linux-mips.mk
@@ -347,8 +347,7 @@
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-x86.mk b/tools/gyp/v8_base.host.linux-x86.mk
index 100037f..7bddd18 100644
--- a/tools/gyp/v8_base.host.linux-x86.mk
+++ b/tools/gyp/v8_base.host.linux-x86.mk
@@ -337,8 +337,7 @@
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-x86_64.mk b/tools/gyp/v8_base.host.linux-x86_64.mk
index 9f56f23..846c5db 100644
--- a/tools/gyp/v8_base.host.linux-x86_64.mk
+++ b/tools/gyp/v8_base.host.linux-x86_64.mk
@@ -337,8 +337,7 @@
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk
index a5fdf00..8393a9c 100644
--- a/tools/gyp/v8_base.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.target.darwin-arm.mk
@@ -403,8 +403,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk
index 23a96ed..52ce047 100644
--- a/tools/gyp/v8_base.target.darwin-arm64.mk
+++ b/tools/gyp/v8_base.target.darwin-arm64.mk
@@ -381,8 +381,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk
index 873d97c..f0831b9 100644
--- a/tools/gyp/v8_base.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.target.darwin-mips.mk
@@ -395,8 +395,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk
index 8b51786..6a83c4b 100644
--- a/tools/gyp/v8_base.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.target.darwin-x86.mk
@@ -386,8 +386,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk
index 703894b..a7185b0 100644
--- a/tools/gyp/v8_base.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_base.target.darwin-x86_64.mk
@@ -384,8 +384,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk
index a5fdf00..8393a9c 100644
--- a/tools/gyp/v8_base.target.linux-arm.mk
+++ b/tools/gyp/v8_base.target.linux-arm.mk
@@ -403,8 +403,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk
index 23a96ed..52ce047 100644
--- a/tools/gyp/v8_base.target.linux-arm64.mk
+++ b/tools/gyp/v8_base.target.linux-arm64.mk
@@ -381,8 +381,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk
index 873d97c..f0831b9 100644
--- a/tools/gyp/v8_base.target.linux-mips.mk
+++ b/tools/gyp/v8_base.target.linux-mips.mk
@@ -395,8 +395,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk
index 8b51786..6a83c4b 100644
--- a/tools/gyp/v8_base.target.linux-x86.mk
+++ b/tools/gyp/v8_base.target.linux-x86.mk
@@ -386,8 +386,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk
index 703894b..a7185b0 100644
--- a/tools/gyp/v8_base.target.linux-x86_64.mk
+++ b/tools/gyp/v8_base.target.linux-x86_64.mk
@@ -384,8 +384,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-arm.mk b/tools/gyp/v8_libbase.host.darwin-arm.mk
index d705525..088ba06 100644
--- a/tools/gyp/v8_libbase.host.darwin-arm.mk
+++ b/tools/gyp/v8_libbase.host.darwin-arm.mk
@@ -160,8 +160,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-arm64.mk b/tools/gyp/v8_libbase.host.darwin-arm64.mk
index e19f14e..a9d0f57 100644
--- a/tools/gyp/v8_libbase.host.darwin-arm64.mk
+++ b/tools/gyp/v8_libbase.host.darwin-arm64.mk
@@ -156,8 +156,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-mips.mk b/tools/gyp/v8_libbase.host.darwin-mips.mk
index 132e77e..1de5308 100644
--- a/tools/gyp/v8_libbase.host.darwin-mips.mk
+++ b/tools/gyp/v8_libbase.host.darwin-mips.mk
@@ -164,8 +164,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-x86.mk b/tools/gyp/v8_libbase.host.darwin-x86.mk
index c796fc0..183365c 100644
--- a/tools/gyp/v8_libbase.host.darwin-x86.mk
+++ b/tools/gyp/v8_libbase.host.darwin-x86.mk
@@ -156,8 +156,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-x86_64.mk b/tools/gyp/v8_libbase.host.darwin-x86_64.mk
index be9ff47..32554a0 100644
--- a/tools/gyp/v8_libbase.host.darwin-x86_64.mk
+++ b/tools/gyp/v8_libbase.host.darwin-x86_64.mk
@@ -156,8 +156,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-arm.mk b/tools/gyp/v8_libbase.host.linux-arm.mk
index 6edd27e..ebb0292 100644
--- a/tools/gyp/v8_libbase.host.linux-arm.mk
+++ b/tools/gyp/v8_libbase.host.linux-arm.mk
@@ -162,8 +162,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-arm64.mk b/tools/gyp/v8_libbase.host.linux-arm64.mk
index b0cbe85..8685a40 100644
--- a/tools/gyp/v8_libbase.host.linux-arm64.mk
+++ b/tools/gyp/v8_libbase.host.linux-arm64.mk
@@ -158,8 +158,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-mips.mk b/tools/gyp/v8_libbase.host.linux-mips.mk
index f43bc33..5105f8b 100644
--- a/tools/gyp/v8_libbase.host.linux-mips.mk
+++ b/tools/gyp/v8_libbase.host.linux-mips.mk
@@ -166,8 +166,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-x86.mk b/tools/gyp/v8_libbase.host.linux-x86.mk
index 45dfca8..81a4984 100644
--- a/tools/gyp/v8_libbase.host.linux-x86.mk
+++ b/tools/gyp/v8_libbase.host.linux-x86.mk
@@ -158,8 +158,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-x86_64.mk b/tools/gyp/v8_libbase.host.linux-x86_64.mk
index b97b6e5..f4ef639 100644
--- a/tools/gyp/v8_libbase.host.linux-x86_64.mk
+++ b/tools/gyp/v8_libbase.host.linux-x86_64.mk
@@ -158,8 +158,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-arm.mk b/tools/gyp/v8_libbase.target.darwin-arm.mk
index 1622462..ca1c27c 100644
--- a/tools/gyp/v8_libbase.target.darwin-arm.mk
+++ b/tools/gyp/v8_libbase.target.darwin-arm.mk
@@ -222,8 +222,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-arm64.mk b/tools/gyp/v8_libbase.target.darwin-arm64.mk
index 5edb048..f3f0c23 100644
--- a/tools/gyp/v8_libbase.target.darwin-arm64.mk
+++ b/tools/gyp/v8_libbase.target.darwin-arm64.mk
@@ -197,8 +197,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-mips.mk b/tools/gyp/v8_libbase.target.darwin-mips.mk
index 354477e..9d5845c 100644
--- a/tools/gyp/v8_libbase.target.darwin-mips.mk
+++ b/tools/gyp/v8_libbase.target.darwin-mips.mk
@@ -214,8 +214,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-x86.mk b/tools/gyp/v8_libbase.target.darwin-x86.mk
index 8ee6ed0..655f092 100644
--- a/tools/gyp/v8_libbase.target.darwin-x86.mk
+++ b/tools/gyp/v8_libbase.target.darwin-x86.mk
@@ -207,8 +207,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-x86_64.mk b/tools/gyp/v8_libbase.target.darwin-x86_64.mk
index c376c96..737d1c4 100644
--- a/tools/gyp/v8_libbase.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_libbase.target.darwin-x86_64.mk
@@ -205,8 +205,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-arm.mk b/tools/gyp/v8_libbase.target.linux-arm.mk
index 1622462..ca1c27c 100644
--- a/tools/gyp/v8_libbase.target.linux-arm.mk
+++ b/tools/gyp/v8_libbase.target.linux-arm.mk
@@ -222,8 +222,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-arm64.mk b/tools/gyp/v8_libbase.target.linux-arm64.mk
index 5edb048..f3f0c23 100644
--- a/tools/gyp/v8_libbase.target.linux-arm64.mk
+++ b/tools/gyp/v8_libbase.target.linux-arm64.mk
@@ -197,8 +197,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-mips.mk b/tools/gyp/v8_libbase.target.linux-mips.mk
index 354477e..9d5845c 100644
--- a/tools/gyp/v8_libbase.target.linux-mips.mk
+++ b/tools/gyp/v8_libbase.target.linux-mips.mk
@@ -214,8 +214,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-x86.mk b/tools/gyp/v8_libbase.target.linux-x86.mk
index 8ee6ed0..655f092 100644
--- a/tools/gyp/v8_libbase.target.linux-x86.mk
+++ b/tools/gyp/v8_libbase.target.linux-x86.mk
@@ -207,8 +207,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-x86_64.mk b/tools/gyp/v8_libbase.target.linux-x86_64.mk
index c376c96..737d1c4 100644
--- a/tools/gyp/v8_libbase.target.linux-x86_64.mk
+++ b/tools/gyp/v8_libbase.target.linux-x86_64.mk
@@ -205,8 +205,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk
index 5b51a15..ef4324f 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk
@@ -171,8 +171,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk
index 07e9626..3c55699 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk
@@ -167,8 +167,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk
index 1c30b52..0d70563 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk
@@ -175,8 +175,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk
index 5dc42a5..01e83be 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk
@@ -167,8 +167,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk
index 3b48330..af29e52 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk
@@ -167,8 +167,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm.mk b/tools/gyp/v8_nosnapshot.host.linux-arm.mk
index 5fb3cfa..67db23e 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-arm.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-arm.mk
@@ -173,8 +173,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk
index 63e5afd..7760a77 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk
@@ -169,8 +169,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-mips.mk b/tools/gyp/v8_nosnapshot.host.linux-mips.mk
index 6fd58be..ff115d2 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-mips.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-mips.mk
@@ -177,8 +177,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86.mk b/tools/gyp/v8_nosnapshot.host.linux-x86.mk
index f425325..d4a27aa 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-x86.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-x86.mk
@@ -169,8 +169,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk
index cf8988d..41883c9 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk
@@ -169,8 +169,7 @@
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-arm.mk b/tools/gyp/v8_snapshot.target.darwin-arm.mk
index 199a4b4..2e48f6d 100644
--- a/tools/gyp/v8_snapshot.target.darwin-arm.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk
@@ -249,8 +249,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-arm64.mk b/tools/gyp/v8_snapshot.target.darwin-arm64.mk
index 28fa8f3..8878435 100644
--- a/tools/gyp/v8_snapshot.target.darwin-arm64.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-arm64.mk
@@ -224,8 +224,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-mips.mk b/tools/gyp/v8_snapshot.target.darwin-mips.mk
index bc76dd1..2bda276 100644
--- a/tools/gyp/v8_snapshot.target.darwin-mips.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk
@@ -241,8 +241,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-x86.mk b/tools/gyp/v8_snapshot.target.darwin-x86.mk
index d89b4c4..b8172f3 100644
--- a/tools/gyp/v8_snapshot.target.darwin-x86.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk
@@ -234,8 +234,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
index 4355284..227d258 100644
--- a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
@@ -232,8 +232,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-arm.mk b/tools/gyp/v8_snapshot.target.linux-arm.mk
index 199a4b4..2e48f6d 100644
--- a/tools/gyp/v8_snapshot.target.linux-arm.mk
+++ b/tools/gyp/v8_snapshot.target.linux-arm.mk
@@ -249,8 +249,7 @@
 	'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-arm64.mk b/tools/gyp/v8_snapshot.target.linux-arm64.mk
index 28fa8f3..8878435 100644
--- a/tools/gyp/v8_snapshot.target.linux-arm64.mk
+++ b/tools/gyp/v8_snapshot.target.linux-arm64.mk
@@ -224,8 +224,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-mips.mk b/tools/gyp/v8_snapshot.target.linux-mips.mk
index bc76dd1..2bda276 100644
--- a/tools/gyp/v8_snapshot.target.linux-mips.mk
+++ b/tools/gyp/v8_snapshot.target.linux-mips.mk
@@ -241,8 +241,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-x86.mk b/tools/gyp/v8_snapshot.target.linux-x86.mk
index d89b4c4..b8172f3 100644
--- a/tools/gyp/v8_snapshot.target.linux-x86.mk
+++ b/tools/gyp/v8_snapshot.target.linux-x86.mk
@@ -234,8 +234,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-x86_64.mk b/tools/gyp/v8_snapshot.target.linux-x86_64.mk
index 4355284..227d258 100644
--- a/tools/gyp/v8_snapshot.target.linux-x86_64.mk
+++ b/tools/gyp/v8_snapshot.target.linux-x86_64.mk
@@ -232,8 +232,7 @@
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS