From 628248724546ae4b764ee2773e6759822964220e Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <jeremya@chromium.org>
Date: Wed, 13 May 2020 15:28:12 -0700
Subject: [PATCH] fix: exclude crashpad_handler binary on linux (#23538)

---
 build/zip.py                                       | 7 +++++++
 script/lib/config.py                               | 1 -
 script/zip_manifests/dist_zip.linux.arm.manifest   | 1 -
 script/zip_manifests/dist_zip.linux.arm64.manifest | 1 -
 script/zip_manifests/dist_zip.linux.x64.manifest   | 1 -
 script/zip_manifests/dist_zip.linux.x86.manifest   | 1 -
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/zip.py b/build/zip.py
index fe4e21ca1bde..f328bdc2742b 100644
--- a/build/zip.py
+++ b/build/zip.py
@@ -25,6 +25,13 @@ PATHS_TO_SKIP = [
   # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
   # ship it.
   'pyproto',
+
+  # On Windows, this binary doesn't exist (the crashpad handler is built-in).
+  # On MacOS, the binary is called 'chrome_crashpad_handler' and is inside the
+  # app bundle.
+  # On Linux, we don't use crashpad, but this binary is still built for some
+  # reason. Exclude it from the zip.
+  './crashpad_handler',
 ]
 
 def skip_path(dep, dist_zip, target_cpu):
diff --git a/script/lib/config.py b/script/lib/config.py
index 9985183c98be..1b68c09a0e0d 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -29,7 +29,6 @@ PLATFORM = {
 LINUX_BINARIES = [
   'electron',
   'chrome-sandbox',
-  'crashpad_handler',
   'libffmpeg.so',
   'libGLESv2.so',
   'libEGL.so',
diff --git a/script/zip_manifests/dist_zip.linux.arm.manifest b/script/zip_manifests/dist_zip.linux.arm.manifest
index fc421e7606d3..36fd7816e077 100644
--- a/script/zip_manifests/dist_zip.linux.arm.manifest
+++ b/script/zip_manifests/dist_zip.linux.arm.manifest
@@ -69,6 +69,5 @@ snapshot_blob.bin
 swiftshader/libEGL.so
 swiftshader/libGLESv2.so
 vk_swiftshader_icd.json
-crashpad_handler
 v8_context_snapshot.bin
 version
diff --git a/script/zip_manifests/dist_zip.linux.arm64.manifest b/script/zip_manifests/dist_zip.linux.arm64.manifest
index fc421e7606d3..36fd7816e077 100644
--- a/script/zip_manifests/dist_zip.linux.arm64.manifest
+++ b/script/zip_manifests/dist_zip.linux.arm64.manifest
@@ -69,6 +69,5 @@ snapshot_blob.bin
 swiftshader/libEGL.so
 swiftshader/libGLESv2.so
 vk_swiftshader_icd.json
-crashpad_handler
 v8_context_snapshot.bin
 version
diff --git a/script/zip_manifests/dist_zip.linux.x64.manifest b/script/zip_manifests/dist_zip.linux.x64.manifest
index fc421e7606d3..36fd7816e077 100644
--- a/script/zip_manifests/dist_zip.linux.x64.manifest
+++ b/script/zip_manifests/dist_zip.linux.x64.manifest
@@ -69,6 +69,5 @@ snapshot_blob.bin
 swiftshader/libEGL.so
 swiftshader/libGLESv2.so
 vk_swiftshader_icd.json
-crashpad_handler
 v8_context_snapshot.bin
 version
diff --git a/script/zip_manifests/dist_zip.linux.x86.manifest b/script/zip_manifests/dist_zip.linux.x86.manifest
index fc421e7606d3..36fd7816e077 100644
--- a/script/zip_manifests/dist_zip.linux.x86.manifest
+++ b/script/zip_manifests/dist_zip.linux.x86.manifest
@@ -69,6 +69,5 @@ snapshot_blob.bin
 swiftshader/libEGL.so
 swiftshader/libGLESv2.so
 vk_swiftshader_icd.json
-crashpad_handler
 v8_context_snapshot.bin
 version