Bug 1121216 - disable BackgroundHangMonitor for TSan builds; r=jchen

This commit is contained in:
Nathan Froyd 2015-08-04 00:27:59 -04:00
parent 793a8a2c48
commit 8108bffcc3

View File

@ -72,7 +72,11 @@ LOCAL_INCLUDES += [
# BHR disabled for Release builds because of bug 965392.
# BHR disabled for debug builds because of bug 979069.
# BHR disabled on gonk because of bug 1180533
if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release') and not CONFIG['MOZ_DEBUG'] and not CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
# BHR disabled for TSan builds because of bug 1121216.
if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release') and \
not CONFIG['MOZ_DEBUG'] and \
not CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and \
not CONFIG['MOZ_TSAN']:
DEFINES['MOZ_ENABLE_BACKGROUND_HANG_MONITOR'] = 1
FINAL_LIBRARY = 'xul'