0061-Revert-content-shell-remove-dependency-to-breakpad.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. From f3063c39746486b80f7e47a8e5f3954e5c24a139 Mon Sep 17 00:00:00 2001
  2. From: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
  3. Date: Mon, 12 Sep 2022 03:16:33 -0400
  4. Subject: [PATCH 61/68] Revert "content: shell: remove dependency to breakpad"
  5. This reverts commit a1fa023c9a7318c1b0f9128b21f7572e2141182c.
  6. Signed-off-by: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
  7. ---
  8. content/shell/BUILD.gn | 13 +++++++++++++
  9. 1 file changed, 13 insertions(+)
  10. diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
  11. index 1dbe9867b483..e8c956adf334 100644
  12. --- a/content/shell/BUILD.gn
  13. +++ b/content/shell/BUILD.gn
  14. @@ -652,6 +652,7 @@ if (is_mac) {
  15. testonly = true
  16. info_plist = "app/framework-Info.plist"
  17. args = [
  18. + "--breakpad=0",
  19. "--keystone=0",
  20. "--scm=1",
  21. "--version",
  22. @@ -725,6 +726,7 @@ if (is_mac) {
  23. testonly = true
  24. info_plist = "app/helper-Info.plist"
  25. args = [
  26. + "--breakpad=0",
  27. "--keystone=0",
  28. "--scm=0",
  29. "--version",
  30. @@ -855,6 +857,7 @@ group("content_shell_crash_test") {
  31. "//third_party/mesa_headers",
  32. ]
  33. data = [
  34. + "//content/shell/tools/breakpad_integration_test.py",
  35. "//testing/scripts/content_shell_crash_test.py",
  36. ]
  37. if (is_mac && !use_system_xcode) {
  38. @@ -870,16 +873,26 @@ group("content_shell_crash_test") {
  39. }
  40. if (is_posix) {
  41. data += [
  42. + "//components/crash/content/tools/generate_breakpad_symbols.py",
  43. "//components/crash/content/tools/dmp2minidump.py",
  44. ]
  45. }
  46. if (is_win) {
  47. data_deps += [ "//build/win:copy_cdb_to_output" ]
  48. }
  49. + if (is_posix) {
  50. + data_deps += [
  51. + "//third_party/breakpad:dump_syms",
  52. + "//third_party/breakpad:minidump_stackwalk",
  53. + ]
  54. + }
  55. if (is_android) {
  56. data_deps += [
  57. "//build/android:devil_chromium_py",
  58. "//build/android:test_runner_py",
  59. + "//third_party/breakpad:microdump_stackwalk",
  60. + "//third_party/breakpad:minidump_dump",
  61. + "//third_party/breakpad:symupload",
  62. "//tools/android/forwarder2",
  63. ]
  64. }
  65. --
  66. 2.30.2