0064-Revert-BUILD.gn-remove-dependency-to-breakpad.patch 3.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117
  1. From a3adb68b5f5ddb2d91c6ac90c3321d75e9f3f65f Mon Sep 17 00:00:00 2001
  2. From: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
  3. Date: Mon, 12 Sep 2022 03:17:01 -0400
  4. Subject: [PATCH 64/68] Revert "BUILD.gn: remove dependency to breakpad"
  5. This reverts commit b8a12227091a33ee987c8392df8a2f1042bf5d2d.
  6. Signed-off-by: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
  7. ---
  8. BUILD.gn | 36 ++++++++++++++++++++++++++++++++++++
  9. 1 file changed, 36 insertions(+)
  10. diff --git a/BUILD.gn b/BUILD.gn
  11. index 847b10c95e9a..6d9fd624b176 100644
  12. --- a/BUILD.gn
  13. +++ b/BUILD.gn
  14. @@ -453,6 +453,10 @@ group("gn_all") {
  15. if (is_linux || is_chromeos || is_android) {
  16. deps += [
  17. + "//third_party/breakpad:breakpad_unittests",
  18. + "//third_party/breakpad:core-2-minidump",
  19. + "//third_party/breakpad:generate_test_dump",
  20. + "//third_party/breakpad:minidump-2-core",
  21. "//tools/dump_process_memory:dump_process",
  22. "//tools/memory/partition_allocator:all",
  23. ]
  24. @@ -605,6 +609,10 @@ group("gn_all") {
  25. "//mojo:mojo_perftests",
  26. "//services/service_manager/public/cpp",
  27. "//testing/gmock:gmock_main",
  28. + "//third_party/breakpad:dump_syms($host_toolchain)",
  29. + "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
  30. + "//third_party/breakpad:minidump_dump($host_toolchain)",
  31. + "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
  32. ]
  33. if (!is_android) {
  34. @@ -630,6 +638,9 @@ group("gn_all") {
  35. if (is_mac) {
  36. deps += [
  37. + "//third_party/breakpad:crash_inspector",
  38. + "//third_party/breakpad:dump_syms",
  39. +
  40. # The following are accessibility API tools.
  41. "//tools/accessibility/inspect:ax_dump_events",
  42. "//tools/accessibility/inspect:ax_dump_tree",
  43. @@ -673,6 +684,8 @@ group("gn_all") {
  44. host_os == "win") {
  45. deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
  46. }
  47. + } else if (!is_android && !is_ios && !is_fuchsia) {
  48. + deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
  49. }
  50. if (is_chromecast) {
  51. @@ -943,6 +956,7 @@ if (is_win) {
  52. "//net:net_unittests",
  53. "//printing:printing_unittests",
  54. "//sql:sql_unittests",
  55. + "//third_party/breakpad:symupload($host_toolchain)",
  56. "//ui/base:ui_base_unittests",
  57. "//ui/gfx:gfx_unittests",
  58. "//ui/touch_selection:ui_touch_selection_unittests",
  59. @@ -969,6 +983,7 @@ if (is_chromeos_ash) {
  60. "//ppapi/examples/video_decode",
  61. "//sandbox/linux:chrome_sandbox",
  62. "//sandbox/linux:sandbox_linux_unittests",
  63. + "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
  64. "//third_party/dawn/src/dawn/tests:dawn_end2end_tests",
  65. "//third_party/dawn/src/dawn/tests:dawn_unittests",
  66. @@ -1132,12 +1147,30 @@ if (!is_ios) {
  67. if (is_android) {
  68. data_deps += [
  69. + "//third_party/breakpad:breakpad_unittests",
  70. + "//third_party/breakpad:dump_syms",
  71. + "//third_party/breakpad:microdump_stackwalk",
  72. + "//third_party/breakpad:minidump_dump",
  73. + "//third_party/breakpad:minidump_stackwalk",
  74. + "//third_party/breakpad:symupload",
  75. "//tools/android/forwarder2",
  76. ]
  77. } else {
  78. data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
  79. }
  80. + if (!is_win && !is_android) {
  81. + data_deps +=
  82. + [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
  83. + }
  84. +
  85. + if (is_mac) {
  86. + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
  87. + }
  88. +
  89. + if (is_linux || is_chromeos) {
  90. + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
  91. + }
  92. if (is_fuchsia) {
  93. data_deps += [
  94. @@ -1532,6 +1565,9 @@ group("chromium_builder_perf") {
  95. if (is_win) {
  96. data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
  97. + } else {
  98. + data_deps +=
  99. + [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
  100. }
  101. if (is_win || is_android) {
  102. data_deps += [
  103. --
  104. 2.30.2