Update chromium patches

This commit is contained in:
Nitish Sakhawalkar 2019-05-13 11:49:01 -07:00
parent f14eb32758
commit e794260d89
52 changed files with 268 additions and 341 deletions

View file

@ -7,7 +7,7 @@ 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 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7815e050d 100755
index dce68b1bd1ef58a5dfddb2bbdb56930ed943ad1d..4249d7b26f9037b60a40e073f56037f9ff036138 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):
@ -22,7 +22,7 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7
"""Return absolute paths to all shared library dependencies of the binary.
This implementation assumes that we're running on a Linux system."""
@@ -74,6 +77,9 @@ def GetSharedLibraryDependenciesLinux(binary):
@@ -71,6 +74,9 @@ def GetSharedLibraryDependenciesLinux(binary):
m = lib_re.match(line)
if m:
result.append(os.path.abspath(m.group(1)))
@ -32,16 +32,16 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7
return result
@@ -168,7 +174,7 @@ def GetSharedLibraryDependencies(options, binary, exe_path):
@@ -183,7 +189,7 @@ def GetSharedLibraryDependencies(options, binary, exe_path):
"""Return absolute paths to all shared library dependencies of the binary."""
deps = []
if sys.platform.startswith('linux'):
if options.platform == 'linux2':
- deps = GetSharedLibraryDependenciesLinux(binary)
+ deps = GetSharedLibraryDependenciesLinux(binary, options)
elif sys.platform == 'darwin':
deps = GetSharedLibraryDependenciesMac(binary, exe_path)
else:
@@ -228,7 +234,8 @@ def GetBinaryInfoFromHeaderInfo(header_info):
elif options.platform == 'android':
deps = GetSharedLibraryDependenciesAndroid(binary)
elif options.platform == 'darwin':
@@ -257,7 +263,8 @@ def CreateSymbolDir(options, output_dir):
def GenerateSymbols(options, binaries):
"""Dumps the symbols of binary and places them in the given directory."""
@ -51,7 +51,7 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7
queue = Queue.Queue()
print_lock = threading.Lock()
@@ -248,8 +255,15 @@ def GenerateSymbols(options, binaries):
@@ -277,8 +284,15 @@ def GenerateSymbols(options, binaries):
reason = "Could not locate dump_syms executable."
break
@ -67,7 +67,7 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7
if not binary_info:
should_dump_syms = False
reason = "Could not obtain binary information."
@@ -266,8 +280,14 @@ def GenerateSymbols(options, binaries):
@@ -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:
@ -80,5 +80,5 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7
+ with print_lock:
+ print "Got symbol_info for %s." % (potential_symbol_file)
if symbol_info == binary_info:
mkdir_p(os.path.dirname(output_path))
CreateSymbolDir(options, output_dir)
shutil.copyfile(potential_symbol_file, output_path)