Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 154997656d89bf91613fbf5022c1cfde15c77423..78bab08634ebb4d9b49fc541294cb3fcfc57cf10 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1065,18 +1065,23 @@ |
# http://crbug.com/574476 |
'fastbuild%': 2, |
}], |
- |
- # Enable crash reporting via Kasko. |
+ # Enable hang report capture. Capture can only be enabled for 32bit |
+ # Windows. |
['OS=="win" and target_arch=="ia32" and branding=="Chrome"', { |
- # This needs to be enabled with kasko_hang_reports. |
- 'kasko%': 0, |
+ # Enable hang reports from the watcher process. |
+ 'kasko_hang_reports%': 0, |
+ # Enable failed rendez-vous reports. |
+ 'kasko_failed_rdv_reports%': 0, |
}, { |
- 'kasko%': 0, |
+ # Enable hang reports from the watcher process. |
+ 'kasko_hang_reports%': 0, |
+ # Enable failed rendez-vous reports. |
+ 'kasko_failed_rdv_reports%': 0, |
}], |
], |
- # Enable hang reports in Kasko. Requires Kasko to be enabled. |
- 'kasko_hang_reports%': 0, |
+ # Kasko reporting is disabled by default, but may get enabled below. |
+ 'kasko%': 0, |
# Setting this to '0' will cause V8's startup snapshot to be |
# embedded in the binary instead of being a external files. |
@@ -1228,6 +1233,7 @@ |
'syzyasan%': '<(syzyasan)', |
'kasko%': '<(kasko)', |
'kasko_hang_reports%': '<(kasko_hang_reports)', |
+ 'kasko_failed_rdv_reports%': '<(kasko_failed_rdv_reports)', |
'syzygy_optimize%': '<(syzygy_optimize)', |
'lsan%': '<(lsan)', |
'msan%': '<(msan)', |
@@ -2023,10 +2029,15 @@ |
}, { |
'win_console_app%': 0, |
}], |
+ # Disable hang reporting for syzyasan builds. |
['syzyasan==1', { |
- 'kasko%': 1, |
- # Disable hang reports for SyzyASAN builds. |
+ # Note: override. |
'kasko_hang_reports': 0, |
+ 'kasko_failed_rdv_reports': 0, |
+ }], |
+ # Enable the Kasko reporter for syzyasan builds and hang reporting. |
+ ['syzyasan==1 or kasko_hang_reports==1 or kasko_failed_rdv_reports==1', { |
+ 'kasko': 1, |
}], |
['component=="shared_library" and "<(GENERATOR)"=="ninja"', { |
# Only enabled by default for ninja because it's buggy in VS. |