Landings for Stack Containing D208456

Successfully landed

Landing requested on , by dmeehan@mozilla.com.

Revisions: D208456 diff 854884

Result: https://hg.mozilla.org/releases/mozilla-esr115/rev/dce433d07c13a10ee93fff3f985ad2f558433ac9

Failed to land

Landing requested on , by dmeehan@mozilla.com.

Revisions: D208456 diff 853251

While applying revision D208456 to esr115, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from esr115 and re-submitting.)

dom/media/gmp/GMPChild.cpp @ fe08d4bea805ddb18d62a7fe24dac0a26df2d0c5

--- GMPChild.cpp
+++ GMPChild.cpp
...

--- GMPChild.cpp
+++ GMPChild.cpp
@@ -39,10 +39,11 @@
 #include "nsReadableUtils.h"
 #include "nsThreadManager.h"
 #include "nsXULAppAPI.h"
 #include "nsIXULRuntime.h"
 #include "nsXPCOM.h"
+#include "nsXPCOMPrivate.h"  // for XUL_DLL
 #include "prio.h"
 #ifdef XP_WIN
 #  include <stdlib.h>  // for _exit()
 #  include "nsIObserverService.h"
 #  include "mozilla/Services.h"

dom/media/gmp/moz.build @ f7f68725a323d1e8749c3c4b19af09a9b8b8cdbd

--- moz.build
+++ moz.build
...

--- moz.build
+++ moz.build
@@ -127,10 +127,12 @@
 ]
 
 if CONFIG["TARGET_OS"] in ["WINNT", "OSX"]:
     DEFINES["SUPPORT_STORAGE_ID"] = 1
 
+DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]
+
 include("/ipc/chromium/chromium-config.mozbuild")
 
 if CONFIG["MOZ_SANDBOX"]:
     # For sandbox includes and the include dependencies those have
     LOCAL_INCLUDES += [

Raw error output:
Problem while applying patch in revision 208456:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmp3qgxusgh: applying /tmp/tmp3qgxusgh

patching file dom/media/gmp/GMPChild.cpp
Hunk #1 FAILED at 38
1 out of 2 hunks FAILED -- saving rejects to file dom/media/gmp/GMPChild.cpp.rej
patching file dom/media/gmp/moz.build
Hunk #1 FAILED at 126
1 out of 1 hunks FAILED -- saving rejects to file dom/media/gmp/moz.build.rej
abort: patch failed to apply

Stack containing revision D208456

Land		Bug	Status	Revision	Reviewers
		1892887	Blocked Repository is not supported by Lando. Closed	D208456: Bug 1892887 - Use MOZ_APP_NAME and XUL_DLL in GMPChild::MakeCDMHostVerificationPaths.	@release-managers accepted a prior diff @dmeehan accepted a prior diff