Commit 3b76355e authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1892887 - Use MOZ_APP_NAME and XUL_DLL in GMPChild::MakeCDMHostVerificationPaths. a=dmeehan 

Differential Revision: https://phabricator.services.mozilla.com/D208456
parent 702f335d

dom/media/gmp/GMPChild.cpp

+4 −7
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "nsThreadManager.h"

#include "nsXULAppAPI.h"

#include "nsIXULRuntime.h"

#include "nsXPCOMPrivate.h"  // for XUL_DLL

#include "prio.h"

#ifdef XP_WIN

#  include <stdlib.h>  // for _exit()
@@ -283,15 +284,11 @@ static bool IsFileLeafEqualToASCII(const nsCOMPtr<nsIFile>& aFile, 
#endif



#if defined(XP_WIN)

#  define FIREFOX_FILE u"firefox.exe"_ns

#  define XUL_LIB_FILE u"xul.dll"_ns

#elif defined(XP_MACOSX)

#  define FIREFOX_FILE u"firefox"_ns

#  define XUL_LIB_FILE u"XUL"_ns

#  define FIREFOX_FILE MOZ_APP_NAME u".exe"_ns

#else

#  define FIREFOX_FILE u"firefox"_ns

#  define XUL_LIB_FILE u"libxul.so"_ns

#  define FIREFOX_FILE MOZ_APP_NAME u""_ns

#endif

#define XUL_LIB_FILE XUL_DLL u""_ns



static nsCOMPtr<nsIFile> GetFirefoxAppPath(

    nsCOMPtr<nsIFile> aPluginContainerPath) {

dom/media/gmp/moz.build

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ PREPROCESSED_IPDL_SOURCES += [ 
if CONFIG["OS_TARGET"] in ["WINNT", "Darwin"]:

    DEFINES["SUPPORT_STORAGE_ID"] = 1



DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]



include("/ipc/chromium/chromium-config.mozbuild")



if CONFIG["MOZ_SANDBOX"]: