Bug 1261643 - Port bug 1114647: add firefox-plugin-container.exe the same way to the package as FX. r=aleth a=bustage fix CLOSED TREE
☠☠ backed out by ba8da2d7a902 ☠ ☠
authorRichard Marti <richard.marti@gmail.com>
Sun, 03 Apr 2016 13:54:28 +0200
changeset 24751 79b497d14c8af8bea463d60b4b0edd1e23d4cbb7
parent 24750 dd20636a9759111a1de643c0f0f9bac9c74245a9
child 24752 0e4f93f7092b9636d53625a2ac8118c17c61d363
push id1657
push userclokep@gmail.com
push dateMon, 06 Jun 2016 19:50:21 +0000
treeherdercomm-beta@9fac989284b5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth, bustage
bugs1261643, 1114647
Bug 1261643 - Port bug 1114647: add firefox-plugin-container.exe the same way to the package as FX. r=aleth a=bustage fix CLOSED TREE
mail/installer/Makefile.in
mail/installer/package-manifest.in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -72,16 +72,17 @@ ifdef MOZ_NATIVE_NSPR
 DEFINES += -DMOZ_NATIVE_NSPR=1
 endif
 
 ifdef MOZ_NATIVE_NSS
 DEFINES += -DMOZ_NATIVE_NSS=1
 endif
 
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
+DEFINES += -DMOZ_PLUGIN_PROCESS_NAME=$(MOZ_PLUGIN_PROCESS_NAME)
 
 # Set MSVC dlls version to package, if any.
 ifdef WIN32_REDIST_DIR
 ifdef MOZ_NO_DEBUG_RTL
 DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
 DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
 endif
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -364,16 +364,17 @@
 ; Base Package Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 @RESPATH@/components/alerts.xpt
 ; accessibility (out of process API support)
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
+@BINPATH@/@MOZ_PLUGIN_PROCESS_NAME@
 #endif
 @RESPATH@/components/accessibility.xpt
 #endif
 @RESPATH@/components/appshell.xpt
 @RESPATH@/components/appstartup.xpt
 @RESPATH@/components/autocomplete.xpt
 @RESPATH@/components/autoconfig.xpt
 @RESPATH@/components/browser-element.xpt