Bug 1390842 - Port bug 1380081 to TB/IB: Package backgroundhangmonitor.xpt and BHRTelemetryService.js/manifest. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Wed, 16 Aug 2017 15:00:57 +0200
changeset 29563 9acb0650ed3adbe22b7d84432bd6393ab15a55d3
parent 29562 3e38d793135a2095ba2300cc0093af60fa536c51
child 29564 4b01552c32d54635bec1c60c4d75b908756d90d9
push id378
push userclokep@gmail.com
push dateMon, 13 Nov 2017 18:45:35 +0000
reviewersbustage-fix
bugs1390842, 1380081
Bug 1390842 - Port bug 1380081 to TB/IB: Package backgroundhangmonitor.xpt and BHRTelemetryService.js/manifest. rs=bustage-fix
im/installer/package-manifest.in
mail/installer/package-manifest.in
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -734,8 +734,18 @@
 
 ; [ Ping Sender ]
 ;
 @BINPATH@/pingsender@BIN_SUFFIX@
 
 ; Shutdown Terminator
 @RESPATH@/components/nsTerminatorTelemetry.js
 @RESPATH@/components/terminator.manifest
+
+; Background Hang Monitor
+@RESPATH@/components/backgroundhangmonitor.xpt
+
+; NOTE: This must match the config checks in
+; /toolkit/components/backgroundhangmonitor/moz.build.
+#if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN)
+@RESPATH@/components/BHRTelemetryService.js
+@RESPATH@/components/BHRTelemetryService.manifest
+#endif
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -855,8 +855,18 @@
 
 ; [ Ping Sender ]
 ;
 @BINPATH@/pingsender@BIN_SUFFIX@
 
 ; Shutdown Terminator
 @RESPATH@/components/nsTerminatorTelemetry.js
 @RESPATH@/components/terminator.manifest
+
+; Background Hang Monitor
+@RESPATH@/components/backgroundhangmonitor.xpt
+
+; NOTE: This must match the config checks in
+; /toolkit/components/backgroundhangmonitor/moz.build.
+#if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN)
+@RESPATH@/components/BHRTelemetryService.js
+@RESPATH@/components/BHRTelemetryService.manifest
+#endif