Bug 943895 - Ship xpcshell in b2g desktop r=vingtetun
authorAlexandre Poirot <poirot.alex@gmail.com>
Thu, 28 Nov 2013 19:49:38 +0100
changeset 172659 164dd694c360fdbacb0bbd5a18253c91ad725c3d
parent 172658 aef6901931d8eaaeaf72e8a5061a7b5237bcca10
child 172660 ab7ece2fd8059f687d0c60ec188c568916a04877
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvingtetun
bugs943895
milestone28.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 943895 - Ship xpcshell in b2g desktop r=vingtetun
b2g/installer/package-manifest.in
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -743,16 +743,23 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DL
 #endif
 
 ; [OS/2]
 #ifdef XP_OS2
 @BINPATH@/MozSounds.cmd
 #endif
 
 [b2g]
+#ifndef MOZ_WIDGET_GONK
+#ifdef XP_WIN32
+@BINPATH@/xpcshell.exe
+#else
+@BINPATH@/xpcshell
+#endif
+#endif
 @BINPATH@/chrome/icons/
 @BINPATH@/chrome/chrome@JAREXT@
 @BINPATH@/chrome/chrome.manifest
 @BINPATH@/components/B2GComponents.manifest
 @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
 #ifdef ENABLE_MARIONETTE
 @BINPATH@/chrome/marionette@JAREXT@
 @BINPATH@/chrome/marionette.manifest