diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 60e95da05d90..fc6d4808dca0 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -67,7 +67,6 @@ DEFINES += -DMOZ_ENABLE_SKIA_PDF=$(MOZ_ENABLE_SKIA_PDF) endif DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) -DEFINES += -DMOZ_EME_PROCESS_NAME="$(MOZ_EME_PROCESS_NAME)" # Set MSVC dlls version to package, if any. ifdef MOZ_NO_DEBUG_RTL diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index ea66f186752f..6ab29ba31e93 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -11,7 +11,6 @@ updater.app/Contents/MacOS/org.mozilla.updater plugin-container.app/Contents/PkgInfo updater.app/Contents/PkgInfo -media-plugin-helper.app/Contents/PkgInfo # Duplicated on Linux by browser/branding/branding-common.mozbuild #ifdef XP_LINUX diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 5348cc4da310..f4c015345fc7 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -90,7 +90,6 @@ #endif #ifdef XP_MACOSX @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/ -@BINPATH@/@MOZ_EME_PROCESS_NAME@.app/ #else @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ #endif diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in index a21611fa530a..b55490ff09a2 100644 --- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -30,7 +30,7 @@ libs:: $(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app $(call py_action,preprocessor,-Fsubstitution -DPROGRAM='$(MOZ_CHILD_PROCESS_NAME)' -DMOZ_DEVELOPER_REPO_PATH='$(topsrcdir)' -DMOZ_DEVELOPER_OBJ_PATH='$(topobjdir)' $(srcdir)/macbuild/Contents/Info.plist.in -o $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/Info.plist) - $(call py_action,preprocessor,-Fsubstitution --output-encoding utf-16 -DAPP_NAME='$(MOZ_CHILD_PROCESS_APPNAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/Resources/English.lproj/InfoPlist.strings) + $(call py_action,preprocessor,-Fsubstitution --output-encoding utf-16 -DAPP_NAME='$(MOZ_CHILD_PROCESS_BUNDLENAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/Resources/English.lproj/InfoPlist.strings) $(NSINSTALL) -D $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS $(NSINSTALL) $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME) $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS endif #} diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp index c308bd166504..b4895e0e452d 100644 --- a/ipc/glue/GeckoChildProcessHost.cpp +++ b/ipc/glue/GeckoChildProcessHost.cpp @@ -19,7 +19,6 @@ # include "SharedMemoryBasic.h" # include "base/rand_util.h" # include "chrome/common/mach_ipc_mac.h" -# include "mozilla/StaticPrefs_media.h" # include "nsILocalFileMac.h" #endif @@ -565,22 +564,6 @@ mozilla::BinPathType BaseProcessLauncher::GetPathToBinary( return pathType; } -#ifdef MOZ_WIDGET_COCOA - // The GMP child process runs via the Media Plugin Helper executable - // which is a clone of plugin-container allowing for GMP-specific - // codesigning entitlements. - nsCString bundleName; - std::string executableLeafName; - if (processType == GeckoProcessType_GMPlugin && - mozilla::StaticPrefs::media_plugin_helper_process_enabled()) { - bundleName = MOZ_EME_PROCESS_BUNDLENAME; - executableLeafName = MOZ_EME_PROCESS_NAME_BRANDED; - } else { - bundleName = MOZ_CHILD_PROCESS_BUNDLENAME; - executableLeafName = MOZ_CHILD_PROCESS_NAME; - } -#endif - if (ShouldHaveDirectoryService()) { MOZ_ASSERT(gGREBinPath); #ifdef OS_WIN @@ -592,7 +575,7 @@ mozilla::BinPathType BaseProcessLauncher::GetPathToBinary( // We need to use an App Bundle on OS X so that we can hide // the dock icon. See Bug 557225. - childProcPath->AppendNative(bundleName); + childProcPath->AppendNative("plugin-container.app"_ns); childProcPath->AppendNative("Contents"_ns); childProcPath->AppendNative("MacOS"_ns); nsCString tempCPath; @@ -615,11 +598,7 @@ mozilla::BinPathType BaseProcessLauncher::GetPathToBinary( exePath = exePath.DirName(); } -#ifdef MOZ_WIDGET_COCOA - exePath = exePath.Append(executableLeafName); -#else exePath = exePath.AppendASCII(MOZ_CHILD_PROCESS_NAME); -#endif return pathType; } diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index 8f89ef15fade..0ec38d014c10 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -279,12 +279,7 @@ FINAL_LIBRARY = "xul" if CONFIG["OS_ARCH"] == "Darwin": OS_LIBS += ["bsm"] # for audit_token_to_pid -for var in ( - "MOZ_CHILD_PROCESS_NAME", - "MOZ_CHILD_PROCESS_BUNDLENAME", - "MOZ_EME_PROCESS_NAME_BRANDED", - "MOZ_EME_PROCESS_BUNDLENAME", -): +for var in ("MOZ_CHILD_PROCESS_NAME", "MOZ_CHILD_PROCESS_BUNDLE"): DEFINES[var] = '"%s"' % CONFIG[var] if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "WINNT": diff --git a/ipc/mediapluginhelper/Makefile.in b/ipc/mediapluginhelper/Makefile.in deleted file mode 100644 index de78bc38bd92..000000000000 --- a/ipc/mediapluginhelper/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(topsrcdir)/config/config.mk - -include $(topsrcdir)/config/rules.mk - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) #{ - -libs:: - $(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app - rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app - $(call py_action,preprocessor,-Fsubstitution -DPROGRAM='$(MOZ_EME_PROCESS_NAME)' -DMOZ_EME_PROCESS_BUNDLEID='$(MOZ_EME_PROCESS_BUNDLEID)' -DMOZ_EME_PROCESS_NAME_BRANDED='$(MOZ_EME_PROCESS_NAME_BRANDED)' -DMOZ_DEVELOPER_REPO_PATH='$(topsrcdir)' -DMOZ_DEVELOPER_OBJ_PATH='$(topobjdir)' $(srcdir)/macbuild/Contents/Info.plist.in -o $(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app/Contents/Info.plist) - $(call py_action,preprocessor,-Fsubstitution --output-encoding utf-16 -DAPP_NAME='$(MOZ_EME_PROCESS_BUNDLENAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o $(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app/Contents/Resources/English.lproj/InfoPlist.strings) - $(NSINSTALL) -D $(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app/Contents/MacOS - cp $(DIST)/bin/$(MOZ_EME_PROCESS_NAME) "$(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app/Contents/MacOS/$(MOZ_EME_PROCESS_NAME_BRANDED)" -endif #} diff --git a/ipc/mediapluginhelper/macbuild/Contents/Info.plist.in b/ipc/mediapluginhelper/macbuild/Contents/Info.plist.in deleted file mode 100644 index 881d878fa748..000000000000 --- a/ipc/mediapluginhelper/macbuild/Contents/Info.plist.in +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - @MOZ_EME_PROCESS_NAME_BRANDED@ - CFBundleIdentifier - @MOZ_EME_PROCESS_BUNDLEID@ - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - LSBackgroundOnly - 1 - NSRequiresAquaSystemAppearance - - NSSupportsAutomaticGraphicsSwitching - - NSHighResolutionCapable - - MozillaDeveloperRepoPath - @MOZ_DEVELOPER_REPO_PATH@ - MozillaDeveloperObjPath - @MOZ_DEVELOPER_OBJ_PATH@ - - diff --git a/ipc/mediapluginhelper/macbuild/Contents/PkgInfo b/ipc/mediapluginhelper/macbuild/Contents/PkgInfo deleted file mode 100644 index bd04210fb49f..000000000000 --- a/ipc/mediapluginhelper/macbuild/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/ipc/mediapluginhelper/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in b/ipc/mediapluginhelper/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in deleted file mode 100644 index 55d15cad8afe..000000000000 --- a/ipc/mediapluginhelper/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in +++ /dev/null @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* Localized versions of Info.plist keys */ - -CFBundleName = "@APP_NAME@"; diff --git a/ipc/mediapluginhelper/moz.build b/ipc/mediapluginhelper/moz.build deleted file mode 100644 index dc292ca8d092..000000000000 --- a/ipc/mediapluginhelper/moz.build +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -if CONFIG["OS_TARGET"] == "Darwin": - GeckoProgram(CONFIG["MOZ_EME_PROCESS_NAME"], linkage="dependent") - SOURCES += [ - "../app/MozillaRuntimeMain.cpp", - ] - - include("/ipc/chromium/chromium-config.mozbuild") - - LDFLAGS += ["-Wl,-rpath,@executable_path/../../../"] - - CXXFLAGS += ["-Wshadow"] - - with Files("**"): - BUG_COMPONENT = ("Core", "Audio/Video: GMP") diff --git a/ipc/moz.build b/ipc/moz.build index 75d75ec6713f..a89607c83a72 100644 --- a/ipc/moz.build +++ b/ipc/moz.build @@ -6,7 +6,6 @@ DIRS += [ "app", - "mediapluginhelper", "chromium", "glue", "ipdl", diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index 36e6b0609c5b..621aebb67ec5 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -11016,15 +11016,6 @@ value: true mirror: always -# On Mac, enables using the ` Media Plugin Helper` executable as the -# GMP child process instead of the plugin-container executable. -#if defined(XP_MACOSX) -- name: media.plugin_helper_process.enabled - type: RelaxedAtomicBool - value: false - mirror: always -#endif - #--------------------------------------------------------------------------- # Prefs starting with "midi." #--------------------------------------------------------------------------- diff --git a/old-configure.in b/old-configure.in index c6cb190b34fc..a35a2e6b5a6a 100644 --- a/old-configure.in +++ b/old-configure.in @@ -1176,32 +1176,12 @@ else MOZ_CHILD_PROCESS_NAME="libplugin-container.so" fi MOZ_CHILD_PROCESS_BUNDLE="plugin-container.app/Contents/MacOS/" -MOZ_CHILD_PROCESS_BUNDLENAME="plugin-container.app" -MOZ_CHILD_PROCESS_APPNAME="${MOZ_APP_DISPLAYNAME}CP" +MOZ_CHILD_PROCESS_BUNDLENAME="${MOZ_APP_DISPLAYNAME}CP" AC_SUBST(MOZ_CHILD_PROCESS_NAME) AC_SUBST(MOZ_CHILD_PROCESS_BUNDLE) -AC_SUBST(MOZ_CHILD_PROCESS_APPNAME) AC_SUBST(MOZ_CHILD_PROCESS_BUNDLENAME) -dnl ========================================================== -dnl = Mac Media Plugin Helper (GMP Child) Process Name for IPC -dnl ========================================================== -MOZ_EME_PROCESS_NAME="media-plugin-helper" -MOZ_EME_PROCESS_NAME_BRANDED="$MOZ_APP_DISPLAYNAME Media Plugin Helper" -MOZ_EME_PROCESS_BUNDLENAME="${MOZ_EME_PROCESS_NAME}.app" -# Generate a lower case string with no spaces to be used as the bundle ID -# for the EME helper .app of the form org.mozilla.. -MOZ_EME_PROCESS_BUNDLEID=`echo "$MOZ_APP_DISPLAYNAME" | tr ' ' '-'` -MOZ_EME_PROCESS_BUNDLEID=`echo "$MOZ_EME_PROCESS_BUNDLEID" | tr 'A-Z' 'a-z'` -MOZ_EME_PROCESS_BUNDLEID=${MOZ_EME_PROCESS_BUNDLEID}-${MOZ_EME_PROCESS_NAME} -MOZ_EME_PROCESS_BUNDLEID=${MOZ_DISTRIBUTION_ID}.${MOZ_EME_PROCESS_BUNDLEID} - -AC_SUBST(MOZ_EME_PROCESS_NAME) -AC_SUBST(MOZ_EME_PROCESS_NAME_BRANDED) -AC_SUBST(MOZ_EME_PROCESS_BUNDLENAME) -AC_SUBST(MOZ_EME_PROCESS_BUNDLEID) - # The following variables are available to branding and application # configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh): # - MOZ_APP_VENDOR: Used for application.ini's "Vendor" field, which also diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index 71ad81120eef..f6f752e82aef 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -646,7 +646,6 @@ class MacArtifactJob(ArtifactJob): "Contents/MacOS", [ "crashreporter.app/Contents/MacOS/crashreporter", - "media-plugin-helper.app/Contents/MacOS/* Media Plugin Helper", "{product}", "{product}-bin", "*.dylib",