Bug 955433 - Port |Port bug 852950 to comm-central - Kill xpcom.dll/libxpcom.so/xpcom.dylib - to fix bustage|, r=florian.
authorPatrick Cloke <clokep@gmail.com>
Sat, 13 Jul 2013 09:55:50 -0400
changeset 19523 46db1225f7ca900332c115e6669d57c7e89c2c16
parent 19522 52b85f372c20c2ef9cd904011d25de395a1db09d
child 19524 716b7123c3205655a1cc5bd993e3dde48ecd374c
push id181
push usermbanner@mozilla.com
push dateMon, 28 Apr 2014 08:56:28 +0000
reviewersflorian
bugs955433, 852950
Bug 955433 - Port |Port bug 852950 to comm-central - Kill xpcom.dll/libxpcom.so/xpcom.dylib - to fix bustage|, r=florian.
im/installer/package-manifest.in
im/installer/removed-files.in
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -57,17 +57,16 @@
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
--- a/im/installer/removed-files.in
+++ b/im/installer/removed-files.in
@@ -251,8 +251,9 @@ components/@DLL_PREFIX@yahoo@DLL_SUFFIX@
 # bug 469814
 #if XP_MACOSX
 components/libpurplexpcom.dylib.dSYM/Contents/Info.plist
 components/libpurplexpcom.dylib.dSYM/Contents/Resources/DWARF/libpurplexpcom.dylib
 #endif
 # bug 701875
 omni.jar
 @DLL_PREFIX@mozutils@DLL_SUFFIX@
+@DLL_PREFIX@xpcom@DLL_SUFFIX@