From b685a6162bc76ab0b78dd379918b800426265484 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Sun, 17 Nov 2013 10:39:15 -0500 Subject: [PATCH] Bug 933947 - Check for sandboxbroker.dll in use from the installer and uninstaller. r=rstrong --- browser/installer/windows/nsis/defines.nsi.in | 4 ++++ browser/installer/windows/nsis/shared.nsh | 3 +++ 2 files changed, 7 insertions(+) diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index 2a03676597c2..d6c932facd3e 100644 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/browser/installer/windows/nsis/defines.nsi.in @@ -71,6 +71,10 @@ !define MOZ_METRO #endif +#ifdef MOZ_CONTENT_SANDBOX +!define MOZ_CONTENT_SANDBOX +#endif + # File details shared by both the installer and uninstaller VIProductVersion "1.0.0.0" VIAddVersionKey "ProductName" "${BrandShortName}" diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 1c38bfb8f132..6d22619c4ab4 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -1268,6 +1268,9 @@ FunctionEnd Push "nspr4.dll" Push "nssdbm3.dll" Push "mozsqlite3.dll" +!ifdef MOZ_CONTENT_SANDBOX + Push "sandboxbroker.dll" +!endif Push "xpcom.dll" Push "crashreporter.exe" Push "updater.exe"