Bug 1454876 - Install marionette.* prefs on Fennec. r=maja_zf,snorp
authorAndreas Tolfsen <ato@sny.no>
Wed, 18 Apr 2018 08:18:09 +0100
changeset 467849 dae5b0150266011c1635cfae88463dac4f1575bd
parent 467848 e6796949f9b56751d48182a2a4ea46b366083aa9
child 467850 46e78a238a4da4e83fcc2f460055da7fa1394da8
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf, snorp
bugs1454876
milestone61.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 1454876 - Install marionette.* prefs on Fennec. r=maja_zf,snorp The marionette.* preference branch, defined in testing/marionette/prefs/marinoette.js, controls aspects of the Gecko remote control protocol. Whilst Marionette is not enabled in optimised Fennec builds, we are apparently missing these preferences when it is built in. The marionette.enabled preference specifically enables the remote server to listen on a TCP port, but its default is false. MozReview-Commit-ID: A6Q4NEQOGJR
mobile/android/installer/package-manifest.in
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -365,21 +365,23 @@
 @BINPATH@/components/PresentationDevicePrompt.js
 @BINPATH@/components/PresentationRequestUIGlue.js
 @BINPATH@/components/PromptService.js
 @BINPATH@/components/SessionStore.js
 @BINPATH@/components/Snippets.js
 @BINPATH@/components/XPIDialogService.js
 #endif
 
+; Remote control protocol
 #ifdef ENABLE_MARIONETTE
 @BINPATH@/chrome/marionette@JAREXT@
 @BINPATH@/chrome/marionette.manifest
 @BINPATH@/components/marionette.manifest
 @BINPATH@/components/marionette.js
+@BINPATH@/defaults/pref/marionette.js
 #endif
 
 #ifdef PKG_LOCALE_MANIFEST
 #include @PKG_LOCALE_MANIFEST@
 #endif
 
 ; NOTE: This must match the config checks in
 ; /toolkit/components/backgroundhangmonitor/moz.build.