зеркало из https://github.com/electron/electron.git
chore: remove patch: fix_breakpad_symbol_generation_on_linux_arm (#23076)
This commit is contained in:
Родитель
905504852e
Коммит
658f8d0abb
|
@ -57,7 +57,6 @@ unsandboxed_ppapi_processes_skip_zygote.patch
|
|||
patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
|
||||
build_add_electron_tracing_category.patch
|
||||
worker_context_will_destroy.patch
|
||||
fix_breakpad_symbol_generation_on_linux_arm.patch
|
||||
frame_host_manager.patch
|
||||
crashpad_pid_check.patch
|
||||
preconnect_feature.patch
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shelley Vohr <shelley.vohr@gmail.com>
|
||||
Date: Tue, 28 May 2019 18:12:17 -0700
|
||||
Subject: fix_breakpad_symbol_generation_on_linux_arm.patch
|
||||
|
||||
Fixes broken Linux ARM breakpad symbol generation by patching
|
||||
out an `ldd`-related call that was throwing.
|
||||
|
||||
diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py
|
||||
index a367fa2bf31591c98dd4245d42a71cd9da82f2d9..662d217b6a33a9dee0ba244b2bab6e3f46834db0 100755
|
||||
--- a/components/crash/content/tools/generate_breakpad_symbols.py
|
||||
+++ b/components/crash/content/tools/generate_breakpad_symbols.py
|
||||
@@ -64,7 +64,8 @@ def GetSharedLibraryDependenciesLinux(binary):
|
||||
"""Return absolute paths to all shared library dependencies of the binary.
|
||||
|
||||
This implementation assumes that we're running on a Linux system."""
|
||||
- ldd = subprocess.check_output(['ldd', binary])
|
||||
+ p = subprocess.Popen(['ldd', binary], stdout=subprocess.PIPE)
|
||||
+ ldd = p.communicate()[0]
|
||||
lib_re = re.compile('\t.* => (.+) \(.*\)$')
|
||||
result = []
|
||||
for line in ldd.splitlines():
|
Загрузка…
Ссылка в новой задаче