Bug 1380081 - Part 14: Include BHRTelemetryService and xpt files in the package, r=froydnj
authorMichael Layzell <michael@thelayzells.com>
Tue, 01 Aug 2017 16:22:40 -0400
changeset 375009 3572c91f1eceb9327bfbb0087ac025542eba8a3a
parent 375008 aa9e74a077331374bef346f1f2817653e0225f1c
child 375010 2ff0b6602d7623e5601bbd2837cc18b56f39baae
push id32344
push usercbook@mozilla.com
push dateWed, 16 Aug 2017 09:23:42 +0000
treeherdermozilla-central@6ebc251bd288 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1380081
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1380081 - Part 14: Include BHRTelemetryService and xpt files in the package, r=froydnj MozReview-Commit-ID: IH56INaSOoK
browser/installer/package-manifest.in
mobile/android/installer/package-manifest.in
toolkit/components/backgroundhangmonitor/BHRTelemetryService.manifest
toolkit/components/backgroundhangmonitor/moz.build
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -834,8 +834,18 @@ bin/libfreebl_32int64_3.so
 @RESPATH@/fix_stack_using_bpsyms.py
 #ifdef XP_MACOSX
 @RESPATH@/fix_macosx_stack.py
 #endif
 #ifdef XP_LINUX
 @RESPATH@/fix_linux_stack.py
 #endif
 #endif
+
+; 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/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -558,8 +558,18 @@
 @BINPATH@/chrome/marionette.manifest
 @BINPATH@/components/marionette.manifest
 @BINPATH@/components/marionette.js
 #endif
 
 #ifdef PKG_LOCALE_MANIFEST
 #include @PKG_LOCALE_MANIFEST@
 #endif
+
+; Background Hang Monitor
+@BINPATH@/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)
+@BINPATH@/components/BHRTelemetryService.js
+@BINPATH@/components/BHRTelemetryService.manifest
+#endif
--- a/toolkit/components/backgroundhangmonitor/BHRTelemetryService.manifest
+++ b/toolkit/components/backgroundhangmonitor/BHRTelemetryService.manifest
@@ -1,3 +1,3 @@
-component {117c8cdf-69e6-4f31-a439-b8a654c67127} BHRTelemetryService.js
-contract @mozilla.org/bhr-telemetry-service;1 {117c8cdf-69e6-4f31-a439-b8a654c67127}
-category profile-after-change BHRTelemetryService @mozilla.org/bhr-telemetry-service;1
\ No newline at end of file
+component {117c8cdf-69e6-4f31-a439-b8a654c67127} BHRTelemetryService.js process=main
+contract @mozilla.org/bhr-telemetry-service;1 {117c8cdf-69e6-4f31-a439-b8a654c67127} process=main
+category profile-after-change BHRTelemetryService @mozilla.org/bhr-telemetry-service;1 process=main
\ No newline at end of file
--- a/toolkit/components/backgroundhangmonitor/moz.build
+++ b/toolkit/components/backgroundhangmonitor/moz.build
@@ -1,29 +1,38 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# We only want to record and report BHR in nightly builds. We don't need to load
-# the BHRTelemetryService outside of nightly builds.
-if CONFIG['NIGHTLY_BUILD']:
+# NOTE: These config options must match the ones in both android/'s and
+# browser/'s package-manifest.in.
+
+# BHR disabled outside of Nightly builds due to expected high ping frequency.
+# BHR disabled for Release builds because of bug 965392.
+# BHR disabled for debug builds because of bug 979069.
+# BHR disabled for TSan builds because of bug 1121216.
+if CONFIG['NIGHTLY_BUILD'] and \
+   not CONFIG['MOZ_DEBUG'] and \
+   not CONFIG['MOZ_TSAN']:
+    DEFINES['MOZ_ENABLE_BACKGROUND_HANG_MONITOR'] = 1
+
     EXTRA_COMPONENTS += [
         'BHRTelemetryService.js',
         'BHRTelemetryService.manifest',
     ]
 
     XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIHangDetails.idl',
 ]
 
-XPIDL_MODULE = 'bhr'
+XPIDL_MODULE = 'backgroundhangmonitor'
 
 EXPORTS.mozilla += [
     'BackgroundHangMonitor.h',
     'HangDetails.h',
     'HangStack.h',
 ]
 
 UNIFIED_SOURCES += [
@@ -32,19 +41,11 @@ UNIFIED_SOURCES += [
     'HangStack.cpp',
     'ThreadStackHelper.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/caps', # For nsScriptSecurityManager.h
 ]
 
-# BHR disabled for Release builds because of bug 965392.
-# BHR disabled for debug builds because of bug 979069.
-# 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_TSAN']:
-    DEFINES['MOZ_ENABLE_BACKGROUND_HANG_MONITOR'] = 1
-
 FINAL_LIBRARY = 'xul'
 
 include('/ipc/chromium/chromium-config.mozbuild')