Skip to content

Commit

Permalink
Merge pull request #1480 from brave/maxk-linux-crash-reporting
Browse files Browse the repository at this point in the history
Fix for crash reporting on Linux.
  • Loading branch information
mkarolin authored Jan 31, 2019
2 parents 6606e40 + 67653f9 commit c20ca87
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
13 changes: 13 additions & 0 deletions patches/chrome-app-chrome_crash_reporter_client.cc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc
index 941caaa910906af473915f444fbbd2b4a9abe4d1..9606df6b5f8bb76acd4b8cf0cea6c58215ffb779 100644
--- a/chrome/app/chrome_crash_reporter_client.cc
+++ b/chrome/app/chrome_crash_reporter_client.cc
@@ -110,7 +110,7 @@ bool ChromeCrashReporterClient::IsRunningUnattended() {
}

bool ChromeCrashReporterClient::GetCollectStatsConsent() {
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(GOOGLE_CHROME_BUILD) || (defined(BRAVE_CHROMIUM_BUILD) && defined(OFFICIAL_BUILD))
bool is_official_chrome_build = true;
#else
bool is_official_chrome_build = false;
17 changes: 17 additions & 0 deletions patches/components-crash-content-app-breakpad_linux.cc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/components/crash/content/app/breakpad_linux.cc b/components/crash/content/app/breakpad_linux.cc
index a7378204ffaa5586be9789a552de0f2a951ad208..9044ab8c9bb148edba86cad6b9781c726ad6dfed 100644
--- a/components/crash/content/app/breakpad_linux.cc
+++ b/components/crash/content/app/breakpad_linux.cc
@@ -88,8 +88,12 @@ namespace breakpad {
namespace {

#if !defined(OS_CHROMEOS)
+#if defined(BRAVE_CHROMIUM_BUILD)
+const char kUploadURL[] = "https://laptop-updates.brave.com/1/bc-crashes";
+#else
const char kUploadURL[] = "https://clients2.google.com/cr/report";
#endif
+#endif

bool g_is_crash_reporter_enabled = false;
uint64_t g_process_start_time = 0;

0 comments on commit c20ca87

Please sign in to comment.