1 files changed, 18 insertions, 9 deletions
diff --git a/www/chromium/files/patch-components_crash_core_common_BUILD.gn b/www/chromium/files/patch-components_crash_core_common_BUILD.gn
index b7177c832a48..5b41932bac30 100644
--- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/common/BUILD.gn.orig	2020-07-07 21:58:15 UTC
+--- components/crash/core/common/BUILD.gn.orig	2020-11-13 06:36:40 UTC
 +++ components/crash/core/common/BUILD.gn
 @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
  
@@ -9,17 +9,26 @@
  }
  
  group("common") {
-@@ -108,7 +108,9 @@ target(crash_key_target_type, "crash_key_lib") {
-       ]
-     }
+@@ -32,7 +32,7 @@ use_crashpad_annotation =
+ # implementations will be instantiated and set, doubling the storage
+ # used for keys. This is intended to be used temporarily to test Crashpad
+ # integrations without disabling Breakpad.
+-use_combined_annotations = is_linux || is_chromeos
++use_combined_annotations = (is_linux || is_chromeos) && !is_bsd
  
--    deps += [ "//third_party/breakpad:client" ]
+ buildflag_header("crash_buildflags") {
+   header = "crash_buildflags.h"
+@@ -93,7 +93,9 @@ target(crash_key_target_type, "crash_key_lib") {
+     sources += [ "crash_key_stubs.cc" ]
+   } else if (use_crashpad_annotation) {
+     sources += [ "crash_key_crashpad.cc" ]
+-    deps += [ "//third_party/crashpad/crashpad/client" ]
 +    if (!is_bsd) {
-+      deps += [ "//third_party/breakpad:client" ]
++      deps += [ "//third_party/crashpad/crashpad/client" ]
 +    }
-     if (use_combined_annotations) {
-       public_deps += [ "//third_party/crashpad/crashpad/client" ]
-     }
+   } else {
+     include_dirs = [ "//third_party/breakpad/breakpad/src" ]
+ 
 @@ -184,7 +186,7 @@ source_set("unit_tests") {
      sources += [ "crash_key_breakpad_ios_unittest.cc" ]
      deps += [ "//third_party/breakpad:client" ]