Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1380081 - Part 14: Include BHRTelemetryService and xpt files in the package, r=froydnj

Browse Source 
MozReview-Commit-ID: IH56INaSOoK
This commit is contained in:
Michael Layzell 2017-08-01 16:22:40 -04:00
parent 0262b178a8
commit 7f649507e9
4 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/installer/package-manifest.in
View File

@ -839,3 +839,13 @@ bin/libfreebl_32int64_3.so
@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

10
mobile/android/installer/package-manifest.in
View File

@ -563,3 +563,13 @@
#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

6
toolkit/components/backgroundhangmonitor/BHRTelemetryService.manifest
View File

@ -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
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

25
toolkit/components/backgroundhangmonitor/moz.build
View File

@ -4,9 +4,18 @@
# 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',
@ -18,7 +27,7 @@ XPIDL_SOURCES += [
'nsIHangDetails.idl',
]
XPIDL_MODULE = 'bhr'
XPIDL_MODULE = 'backgroundhangmonitor'
EXPORTS.mozilla += [
'BackgroundHangMonitor.h',
@ -37,14 +46,6 @@ 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')