b7d25ccb77
* chore: bump chromium in DEPS to f3bf493731e868e1f5f48e7e1adc02ea5eccfbbd * chore: bump chromium in DEPS to 4db0c87d4aa6f27ffa0b5fc77d20e10047962484 * chore: bump chromium in DEPS to d933a504c264dc8fe85267f47aef3588531875b5 * chore: bump chromium in DEPS to 34afdb68980f581ae911b85b727bc17e126cf5f9 * update disable-redraw-lock.patch https://chromium-review.googlesource.com/c/chromium/src/+/1600387 * update desktop_media_list.patch https://chromium-review.googlesource.com/c/chromium/src/+/1729156 * update notification_provenance.patch https://chromium-review.googlesource.com/c/chromium/src/+/1742779 * update printing.patch https://chromium-review.googlesource.com/c/chromium/src/+/1646772 * update verbose_generate_bpad_syms.patch https://chromium-review.googlesource.com/c/chromium/src/+/1745986 * update patch metadata * remove printing_compositor manifests https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * update for URLLoaderFactoryType enum https://chromium-review.googlesource.com/c/chromium/src/+/1754716 * remove gin string16 converter https://chromium-review.googlesource.com/c/chromium/src/+/1750093 * ClearCompositorFrame() has been removed https://chromium-review.googlesource.com/c/chromium/src/+/1746301 * message_loop -> message_loop_current https://chromium-review.googlesource.com/c/chromium/src/+/1738552 * include resource_response header * pdf compositor no longer uses service manager https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * chore: bump chromium in DEPS to 00d5933101d8d8dc9546eadbe7ee1b41077e6db1 * pane focus fns aren't pure virtual anymore https://chromium-review.googlesource.com/c/chromium/src/+/1708767 * fix: make std::hash value-non-const broken by https://chromium-review.googlesource.com/c/chromium/src/+/1711202 * update swiftshader in zip_manifests https://swiftshader-review.googlesource.com/c/SwiftShader/+/34911 * address feedback from @deepak1556 * don't enable kLegacyWindowsDWriteFontFallback https://chromium-review.googlesource.com/c/chromium/src/+/1753006 * chore: bump chromium in DEPS to 84497314005e1968da06804f8fde539d9872310e * update printing.patch remove bottom diff owing to https://chromium-review.googlesource.com/c/chromium/src/+/1678182 and update for https://chromium-review.googlesource.com/c/chromium/src/+/1678182 * convert CookieChangeListener to new Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1753371 * rename ui::ClipboardType -> ui::ClipboardBuffer https://chromium-review.googlesource.com/c/chromium/src/+/1758730 * logging::LoggingSettings log_file -> log_file_path https://chromium-review.googlesource.com/c/chromium/src/+/1699477 * roll DEPS to latest lkgr * fix: override GetFontLookupTableCacheDir() When Chromium goes to use its fallback font table creation code paths, it creates the cache directory it uses by calling GetFontLookupTableCacheDir() with a path that doesn't exist in Electron. To ensure that a legitimate file path is created, we need to override it with Electron's DIR_USER_DATA so it doesn't use chrome::DIR_USER_DATA. * chore: bump chromium in DEPS to 6758a0879931bc4df630a80a36c82d7855ae3155 * update pthread_fchdir patch https://chromium-review.googlesource.com/c/chromium/src/+/1759149 * update printing patch * update cookie usage and fn signatures https://chromium-review.googlesource.com/c/chromium/src/+/1758437 * chore: bump chromium in DEPS to bdaca97e1cc27fb977e56f30f74cdb906da9527e * remove fix_make_std_hash_value-non-const.patch https://chromium-review.googlesource.com/c/chromium/src/+/1762335 * Convert enum to enum class for FocusManager::FocusChangeReason https://chromium-review.googlesource.com/c/chromium/src/+/1767281 * roll DEPS to latest lkgr * update dom_storage_limits.patch https://chromium-review.googlesource.com/c/chromium/src/+/1767556
84 lines
3.7 KiB
Diff
84 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: John Kleinschmidt <jkleinsc@github.com>
|
|
Date: Thu, 18 Oct 2018 17:08:28 -0700
|
|
Subject: verbose_generate_breakpad_symbols.patch
|
|
|
|
Temporarily add additional debugging statements to
|
|
generate_breakpad_symbols.py to determine why it is hanging.
|
|
|
|
diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py
|
|
index db04d39f8d263dc2b3b67b7f84470f557b519cfa..edb3fa5c125fae7858a1f36495410baf47d58484 100755
|
|
--- a/components/crash/content/tools/generate_breakpad_symbols.py
|
|
+++ b/components/crash/content/tools/generate_breakpad_symbols.py
|
|
@@ -60,7 +60,10 @@ def Resolve(path, exe_path, loader_path, rpaths):
|
|
return path
|
|
|
|
|
|
-def GetSharedLibraryDependenciesLinux(binary):
|
|
+def GetSharedLibraryDependenciesLinux(binary, options):
|
|
+ if options.verbose:
|
|
+ print "GetSharedLibraryDependencies for %s" % binary
|
|
+
|
|
"""Return absolute paths to all shared library dependencies of the binary.
|
|
|
|
This implementation assumes that we're running on a Linux system."""
|
|
@@ -71,6 +74,9 @@ def GetSharedLibraryDependenciesLinux(binary):
|
|
m = lib_re.match(line)
|
|
if m:
|
|
result.append(os.path.abspath(m.group(1)))
|
|
+ if options.verbose:
|
|
+ print "Done GetSharedLibraryDependencies for %s" % binary
|
|
+ print result
|
|
return result
|
|
|
|
|
|
@@ -183,7 +189,7 @@ def GetSharedLibraryDependencies(options, binary, exe_path):
|
|
"""Return absolute paths to all shared library dependencies of the binary."""
|
|
deps = []
|
|
if options.platform == 'linux2':
|
|
- deps = GetSharedLibraryDependenciesLinux(binary)
|
|
+ deps = GetSharedLibraryDependenciesLinux(binary, options)
|
|
elif options.platform == 'android':
|
|
deps = GetSharedLibraryDependenciesAndroid(binary)
|
|
elif options.platform == 'darwin':
|
|
@@ -257,7 +263,8 @@ def CreateSymbolDir(options, output_dir, relative_hash_dir):
|
|
|
|
def GenerateSymbols(options, binaries):
|
|
"""Dumps the symbols of binary and places them in the given directory."""
|
|
-
|
|
+ if options.verbose:
|
|
+ print "Generating symbols for %s " % (' '.join(binaries))
|
|
queue = Queue.Queue()
|
|
print_lock = threading.Lock()
|
|
|
|
@@ -277,8 +284,15 @@ def GenerateSymbols(options, binaries):
|
|
reason = "Could not locate dump_syms executable."
|
|
break
|
|
|
|
+ if options.verbose:
|
|
+ with print_lock:
|
|
+ print "GetBinaryInfoFromHeaderInfo for %s" % (binary)
|
|
binary_info = GetBinaryInfoFromHeaderInfo(
|
|
subprocess.check_output([dump_syms, '-i', binary]).splitlines()[0])
|
|
+ if options.verbose:
|
|
+ with print_lock:
|
|
+ print "Done GetBinaryInfoFromHeaderInfo for %s: %s (%s)" % (binary, binary_info.name, binary_info.hash)
|
|
+
|
|
if not binary_info:
|
|
should_dump_syms = False
|
|
reason = "Could not obtain binary information."
|
|
@@ -296,8 +310,14 @@ def GenerateSymbols(options, binaries):
|
|
# See if there is a symbol file already found next to the binary
|
|
potential_symbol_files = glob.glob('%s.breakpad*' % binary)
|
|
for potential_symbol_file in potential_symbol_files:
|
|
+ if options.verbose:
|
|
+ with print_lock:
|
|
+ print "Looking at %s as a potential symbol file." % (potential_symbol_file)
|
|
with open(potential_symbol_file, 'rt') as f:
|
|
symbol_info = GetBinaryInfoFromHeaderInfo(f.readline())
|
|
+ if options.verbose:
|
|
+ with print_lock:
|
|
+ print "Got symbol_info for %s." % (potential_symbol_file)
|
|
if symbol_info == binary_info:
|
|
CreateSymbolDir(options, output_dir, binary_info.hash)
|
|
shutil.copyfile(potential_symbol_file, output_path)
|