From 011dac290a9ea52539754aa64958df204425eb76 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 12 Dec 2017 22:44:02 +0100 Subject: Don't build GMP-clearkey when not building EME. --- browser/installer/package-manifest.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'browser/installer') diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index c2269c069..dee6a3faa 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -821,8 +821,10 @@ bin/libfreebl_32int64_3.so ; media +#ifdef MOZ_EME @RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ @RESPATH@/gmp-clearkey/0.1/clearkey.info +#endif ; gfx #ifdef XP_WIN -- cgit v1.2.3 From b6c2d5f6ae5dfbbafe7c5488942fe775bc617aaa Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 1 Mar 2018 12:18:10 -0500 Subject: Update 7zSFX --- browser/installer/windows/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser/installer') diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index a8305d077..600bdfeb6 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -5,7 +5,7 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk CONFIG_DIR = instgen -SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx +SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/uxp/7zSD.sfx INSTALLER_FILES = \ app.tag \ -- cgit v1.2.3 From ba2c2e5301bb2d993984c62cdf2fd07b361e6bca Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 1 Mar 2018 14:35:14 -0500 Subject: Remove MOZ_MULET --- browser/installer/Makefile.in | 4 ---- browser/installer/package-manifest.in | 4 ---- 2 files changed, 8 deletions(-) (limited to 'browser/installer') diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index ccfce3cd9..4a934fe45 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -13,11 +13,7 @@ MOZ_PKG_MANIFEST = $(srcdir)/package-manifest.in MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn # Some files have been already bundled with xulrunner -ifndef MOZ_MULET MOZ_PKG_FATAL_WARNINGS = 1 -else -DEFINES += -DMOZ_MULET -endif # When packaging an artifact build not all xpt files expected by the # packager will be present. diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index dee6a3faa..015daa8c7 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -831,7 +831,3 @@ bin/libfreebl_32int64_3.so @RESPATH@/components/GfxSanityTest.manifest @RESPATH@/components/SanityTest.js #endif - -#ifdef MOZ_MULET -#include ../../b2g/installer/package-manifest.in -#endif -- cgit v1.2.3