Browse Source

chore: patch dump_syms to not hard fail on dylib resolve error (#15056)

Samuel Attard 6 years ago
parent
commit
7159080ec5
2 changed files with 20 additions and 0 deletions
  1. 7 0
      patches/common/chromium/.patches.yaml
  2. 13 0
      patches/common/chromium/dump_syms.patch

+ 7 - 0
patches/common/chromium/.patches.yaml

@@ -484,3 +484,10 @@ patches:
     Pass idle quit closure for main message loop, so that pending tasks are
     run before shutdown. This is required to cleanup WebContents asynchronously
     in atom::CommonWebContentsDelegate::ResetManageWebContents.
+-
+  author: Samuel Attard <[email protected]>
+  file: dump_syms.patch
+  description: |
+    dylib currently fails to resolve Squirrel.framework on OSX, we need to fix
+    this but it is not a blocker for releasing Electron.  This patch removes
+    the hard fail on dylib resolve failure from dump_syms

+ 13 - 0
patches/common/chromium/dump_syms.patch

@@ -0,0 +1,13 @@
+diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py
+index 2032f1991ada..58646a10591a 100755
+--- a/components/crash/content/tools/generate_breakpad_symbols.py
++++ b/components/crash/content/tools/generate_breakpad_symbols.py
+@@ -159,7 +159,7 @@ def GetSharedLibraryDependenciesMac(binary, exe_path):
+             'ERROR: failed to resolve %s, exe_path %s, loader_path %s, '
+             'rpaths %s' % (m.group(1), exe_path, loader_path,
+                            ', '.join(rpaths)))
+-        sys.exit(1)
++        # sys.exit(1)
+   return deps
+ 
+