From 1bfbbad000a7a83904e987a33aa1ace21b0ba4bf Mon Sep 17 00:00:00 2001 From: Philip Chee Date: Sat, 19 Jul 2014 11:17:00 +0800 Subject: [PATCH] Bug 1040939 - Fix startup error "Couldn't load XPCOM" Package sandboxbroker.dll r=ewong rs=bustagefix Ports Firefox bugs: Bug 933947 - Check for sandboxbroker.dll in use from the installer and uninstaller Bug 985252 - Sandbox Gecko Media Plugins (including OpenH264) for Windows - Build sandbox code regardless of whether --enable-content-sandbox/MOZ_CONTENT_SANDBOX is provided. - Enable sandboxing of GMP plugins. - Enable `SandboxBroker` to set different security policies for different process types. --- suite/installer/package-manifest.in | 5 +++++ suite/installer/windows/nsis/shared.nsh | 1 + 2 files changed, 6 insertions(+) diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in index 99d15a8eee..c90e12b430 100644 --- a/suite/installer/package-manifest.in +++ b/suite/installer/package-manifest.in @@ -680,6 +680,11 @@ @BINPATH@/components/pipnss.xpt @BINPATH@/components/pippki.xpt +; For process sandboxing +#if defined(XP_WIN) +@BINPATH@/@DLL_PREFIX@sandboxbroker@DLL_SUFFIX@ +#endif + ; for Solaris SPARC #ifdef SOLARIS bin/libfreebl_32fpu_3.so diff --git a/suite/installer/windows/nsis/shared.nsh b/suite/installer/windows/nsis/shared.nsh index 7028745831..5fcdcdec06 100644 --- a/suite/installer/windows/nsis/shared.nsh +++ b/suite/installer/windows/nsis/shared.nsh @@ -999,6 +999,7 @@ Push "nssdbm3.dll" Push "sqlite3.dll" Push "mozsqlite3.dll" + Push "sandboxbroker.dll" Push "xpcom.dll" Push "crashreporter.exe" Push "updater.exe"