From 766beea9b74e9322339d335f6768191bef75d746 Mon Sep 17 00:00:00 2001 From: Joshua Peraza Date: Wed, 22 Apr 2020 17:25:56 +0000 Subject: [PATCH] Roll src/third_party/breakpad/breakpad/ f32b83eb0..a2d3e8b2d (31 commits; 2 trivial rolls) https://chromium.googlesource.com/breakpad/breakpad.git/+log/f32b83eb08e9..a2d3e8b2d5f8 $ git log f32b83eb0..a2d3e8b2d --date=short --no-merges --format='%ad %ae %s' 2020-04-16 jperaza Use stdint.h numeric types in tests 2020-04-16 jperaza Use portable format macros 2020-04-08 jperaza Use stdint.h numeric types 2020-03-18 mforney Remove true/false defines in convert_UTF.cc 2020-03-16 mforney Use ULONG_MAX instead of __WORDSIZE to determine native ELF architecture 2020-03-16 mforney Use breakpad_getcontext on all Linux platforms missing getcontext 2019-09-14 vapier convert_UTF: try to update xcode files 2020-03-12 mforney Fix some bugs in CheckMicrodumpContents 2020-03-10 mforney Remove sys/signal.h compatibility header 2020-03-10 mforney Add google_crashdump_uploader_test to .gitignore 2020-03-10 mforney Remove redundant LINUX_HOST conditional 2020-03-10 mforney Use public fpregset_t type to define fpstate_t 2020-03-10 mforney Use ULONG_MAX instead of __WORDSIZE to determine ELF class 2020-03-10 mforney Use standard header locations for poll.h and signal.h 2020-03-10 mforney Use sched_yield instead of pthread_yield 2020-03-10 vapier Revert "Add new dwarf 5 enums, plus some dwarf4 enums." 2020-03-09 vapier Revert "Add dwarf5 compilation-unit header handling." 2020-03-06 mark dump_syms: Reintroduce warnings inadvertently removed by 47cd498384fd 2020-02-27 nbilling Add "type" option to sym_upload sym-upload-v2 mode. 2020-02-21 nbilling Make LibcurlWrapper support static linking. 2020-02-21 jperaza linux: fix symupload build failures 2020-02-20 jperaza android: truncate lower of two overlapping modules 2020-02-19 nbilling Add optional new symbol upload API to sym_upload. 2020-01-28 ivanpe Update Xcode project files to fix build errors. 2020-01-14 sunsj1231 arm64: recover register X30(LR) when fallback to frame pointer unwinder 2020-01-03 jperaza Extract the exception record from the minidump 2020-01-03 jperaza ios: build for arm64e 2019-12-13 saugustine Add dwarf5 compilation-unit header handling. 2019-12-12 saugustine Add new dwarf 5 enums, plus some dwarf4 enums. Created with: roll-dep src/third_party/breakpad/breakpad Bug: 1071764 Change-Id: Icb4d2c0ad2efb57d74598a9e13cec01b8e1b2dfd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159801 Reviewed-by: Sergey Volk Reviewed-by: Mark Mentovai Commit-Queue: Joshua Peraza Cr-Commit-Position: refs/heads/master@{#761514} --- DEPS | 2 +- chromecast/crash/cast_crashdump_uploader.cc | 2 +- chromecast/crash/cast_crashdump_uploader_unittest.cc | 2 +- third_party/breakpad/BUILD.gn | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index acdcbf9ec43c4e..29bbe873738ed1 100644 --- a/DEPS +++ b/DEPS @@ -804,7 +804,7 @@ deps = { }, 'src/third_party/breakpad/breakpad': - Var('chromium_git') + '/breakpad/breakpad.git' + '@' + 'f32b83eb08e9ee158d3037b2114357187fd45a05', + Var('chromium_git') + '/breakpad/breakpad.git' + '@' + 'a2d3e8b2d5f8f3de06eefec50566c9a54d7cf0a6', 'src/third_party/byte_buddy': { 'packages': [ diff --git a/chromecast/crash/cast_crashdump_uploader.cc b/chromecast/crash/cast_crashdump_uploader.cc index 3a278f8c51594b..6920ebb63955fb 100644 --- a/chromecast/crash/cast_crashdump_uploader.cc +++ b/chromecast/crash/cast_crashdump_uploader.cc @@ -117,7 +117,7 @@ bool CastCrashdumpUploader::Upload(std::string* response) { LOG(INFO) << "Sending request to " << data_.crash_server; - int http_status_code; + long http_status_code; std::string http_header_data; return http_layer_->SendRequest(data_.crash_server, parameters_, diff --git a/chromecast/crash/cast_crashdump_uploader_unittest.cc b/chromecast/crash/cast_crashdump_uploader_unittest.cc index 941cce26bab36c..a5fc5fe21d4682 100644 --- a/chromecast/crash/cast_crashdump_uploader_unittest.cc +++ b/chromecast/crash/cast_crashdump_uploader_unittest.cc @@ -25,7 +25,7 @@ class MockLibcurlWrapper : public google_breakpad::LibcurlWrapper { MOCK_METHOD5(SendRequest, bool(const std::string& url, const std::map& parameters, - int* http_status_code, + long* http_status_code, std::string* http_header_data, std::string* http_response_data)); }; diff --git a/third_party/breakpad/BUILD.gn b/third_party/breakpad/BUILD.gn index 72e171e233632d..14313c7de80f9d 100644 --- a/third_party/breakpad/BUILD.gn +++ b/third_party/breakpad/BUILD.gn @@ -471,6 +471,10 @@ if (is_linux || is_android) { sources = [ "breakpad/src/common/linux/http_upload.cc", "breakpad/src/common/linux/http_upload.h", + "breakpad/src/common/linux/libcurl_wrapper.cc", + "breakpad/src/common/linux/libcurl_wrapper.h", + "breakpad/src/common/linux/symbol_collector_client.cc", + "breakpad/src/common/linux/symbol_collector_client.h", "breakpad/src/common/linux/symbol_upload.cc", "breakpad/src/common/linux/symbol_upload.h", "breakpad/src/tools/linux/symupload/sym_upload.cc", @@ -600,6 +604,7 @@ if (is_linux || is_android) { "breakpad/src/common/linux/elfutils.h", "breakpad/src/common/linux/file_id.cc", "breakpad/src/common/linux/file_id.h", + "breakpad/src/common/linux/breakpad_getcontext.S", "breakpad/src/common/linux/google_crashdump_uploader.cc", "breakpad/src/common/linux/google_crashdump_uploader.h", "breakpad/src/common/linux/guid_creator.cc", @@ -629,10 +634,6 @@ if (is_linux || is_android) { cflags = [ "-marm" ] } - if (is_android) { - sources += [ "breakpad/src/common/android/breakpad_getcontext.S" ] - } - libs = [ "dl" ] include_dirs = [ @@ -685,6 +686,7 @@ if (is_linux || is_android) { "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc", "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc", "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc", + "breakpad/src/common/linux/breakpad_getcontext_unittest.cc", "breakpad/src/common/linux/elf_core_dump_unittest.cc", "breakpad/src/common/linux/file_id_unittest.cc", "breakpad/src/common/linux/linux_libc_support_unittest.cc", @@ -735,8 +737,6 @@ if (is_linux || is_android) { if (is_android) { use_raw_android_executable = true - sources += - [ "breakpad/src/common/android/breakpad_getcontext_unittest.cc" ] libs = [ "log" ] extra_dist_files = [ "$root_out_dir/linux_dumper_unittest_helper" ] }