Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D208456
This commit is contained in:
Mike Hommey 2024-04-26 19:26:54 +00:00
parent 702f335d63
commit 3b76355eb2
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/media/gmp/GMPChild.cpp
View File

@ -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) {

2
dom/media/gmp/moz.build
View File

@ -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"]: