0063-Revert-tools-perf-chrome_telemetry_build-remove-depe.patch 2.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566
  1. From 3e7d039c75f70508476a4a47bf4b6fd2dd9ffdbd 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:51 -0400
  4. Subject: [PATCH 63/68] Revert "tools: perf: chrome_telemetry_build: remove
  5. dependency to breakpad"
  6. This reverts commit 21c5250300bc80dc58bd1da53554950ba1c221cd.
  7. Signed-off-by: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
  8. ---
  9. tools/perf/chrome_telemetry_build/BUILD.gn | 18 ++++++++++++++++++
  10. 1 file changed, 18 insertions(+)
  11. diff --git a/tools/perf/chrome_telemetry_build/BUILD.gn b/tools/perf/chrome_telemetry_build/BUILD.gn
  12. index d782d15bc70e..2d6c25ea2d0b 100644
  13. --- a/tools/perf/chrome_telemetry_build/BUILD.gn
  14. +++ b/tools/perf/chrome_telemetry_build/BUILD.gn
  15. @@ -46,6 +46,8 @@ group("telemetry_chrome_test") {
  16. }
  17. if (is_linux || is_chromeos) {
  18. + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
  19. +
  20. # CrOS currently has issues with the locally compiled version of
  21. # crashpad_database_util, so only include it on traditional Linux
  22. # platforms.
  23. @@ -59,6 +61,7 @@ group("telemetry_chrome_test") {
  24. data_deps += [
  25. "//chrome:chrome_framework",
  26. "//chrome:chrome_helper_app_default",
  27. + "//third_party/breakpad:dump_syms",
  28. "//third_party/crashpad/crashpad/tools:crashpad_database_util",
  29. ]
  30. }
  31. @@ -198,6 +201,7 @@ group("telemetry_chrome_test_without_chrome") {
  32. data = [
  33. "//build/android/pylib/", # chromium_config.py uses pylib to look for Java
  34. + "//components/crash/content/tools/generate_breakpad_symbols.py",
  35. "//tools/perf/chrome_telemetry_build/",
  36. "//tools/perf/core/", # chrome_telemetry_build/ depends on core/
  37. ]
  38. @@ -207,6 +211,20 @@ group("telemetry_chrome_test_without_chrome") {
  39. "//tools/metrics:metrics_python_tests",
  40. ]
  41. + # Cr-Fuchsia doesn't support breakpad.
  42. + if (!is_win && !is_fuchsia) {
  43. + data_deps += [
  44. + # This is defined for Windows, but is unused by Telemetry on
  45. + # Windows, and including it can have issues when cross-compiling
  46. + # for Arm-based Windows.
  47. + "//third_party/breakpad:dump_syms",
  48. +
  49. + # These explicitly not defined for Windows builds in Breakpad.
  50. + "//third_party/breakpad:minidump_dump",
  51. + "//third_party/breakpad:minidump_stackwalk",
  52. + ]
  53. + }
  54. +
  55. if (is_mac) {
  56. data += [
  57. # Required for the hermetic otool binary, which is required for
  58. --
  59. 2.30.2