Bug 1454876 - Make it possible to compile Firefox without Marionette. r=Gijs,maja_zf

Marionette is only built when ENABLE_MARIONETTE is defined, but
we unconditionally include its resources in Firefox' packaging
instructions.  These resources ought to be guarded with the same
rule to actually make it possible to disable Marionette without
breaking the packaging.

We already do this on Fennec, see
mobile/android/installer/package-manifest.in:373.

MozReview-Commit-ID: 3s8e9sk6KGx

--HG--
extra : rebase_source : 2aa55172bfa1a77090fed37cb2b26fd6a7d27f07

browser/installer/package-manifest.in

@@ -330,10 +330,14 @@
 @RESPATH@/components/PeerConnection.manifest
 #endif
 
+; Remote control protocol
+#ifdef ENABLE_MARIONETTE
 @RESPATH@/chrome/marionette@JAREXT@
 @RESPATH@/chrome/marionette.manifest
 @RESPATH@/components/marionette.manifest
 @RESPATH@/components/marionette.js
+@RESPATH@/defaults/pref/marionette.js
+#endif
 
 @RESPATH@/components/nsAsyncShutdown.manifest
 @RESPATH@/components/nsAsyncShutdown.js
@@ -456,10 +460,6 @@
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 
-; Remote control protocol prefs
-; defined in ../../testing/marionette/prefs/marionette.js
-@RESPATH@/defaults/pref/marionette.js
-
 ; Services (gre) prefs
 @RESPATH@/defaults/pref/services-sync.js