Bug 1624047 - Fix default browser agent packaging. r=bytesized
authorMolly Howell <mhowell@mozilla.com>
Fri, 20 Mar 2020 22:16:30 +0000
changeset 519944 dd4b53e8017732d05df05b7f9bfbb0ed74918f66
parent 519943 ee3eb7735df344ffc218933002bd8b0b0a9ae1c1
child 519945 ea74f7a4ea71011ca77976e7d03015f29d1e50b4
push id110778
push usermhowell@mozilla.com
push dateFri, 20 Mar 2020 22:18:31 +0000
treeherderautoland@dd4b53e80177 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbytesized
bugs1624047
milestone76.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1624047 - Fix default browser agent packaging. r=bytesized Differential Revision: https://phabricator.services.mozilla.com/D67705
browser/installer/Makefile.in
browser/installer/package-manifest.in
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -89,16 +89,20 @@ endif
 ifdef NECKO_WIFI
 DEFINES += -DNECKO_WIFI
 endif
 
 ifdef MAKENSISU
 DEFINES += -DHAVE_MAKENSISU=1
 endif
 
+ifdef MOZ_DEFAULT_BROWSER_AGENT
+DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1
+endif
+
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
 MOZ_PKG_MAC_ICON=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
 endif
 
 # The packager minifies two different types of files: non-JS (mostly property
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -446,17 +446,16 @@ bin/libfreebl_64int_3.so
 @BINPATH@/msdia140.dll
 #endif
 #endif
 
 #ifdef MOZ_CLANG_RT_ASAN_LIB
 @BINPATH@/@MOZ_CLANG_RT_ASAN_LIB@
 #endif
 
-
 ; media
 @RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
 @RESPATH@/gmp-clearkey/0.1/manifest.json
 
 #ifdef MOZ_DMD
 ; DMD
 @RESPATH@/dmd.py
 @RESPATH@/fix_stacks.py
@@ -468,26 +467,26 @@ bin/libfreebl_64int_3.so
 @RESPATH@/fix_linux_stack.py
 #endif
 #endif
 
 #ifdef PKG_LOCALE_MANIFEST
 #include @PKG_LOCALE_MANIFEST@
 #endif
 
+#if defined(XP_WIN) && defined(MOZ_DEFAULT_BROWSER_AGENT)
+@BINPATH@/default-browser-agent@BIN_SUFFIX@
+#endif
+
 #ifdef MOZ_EME_WIN32_ARTIFACT
 i686/plugin-container.exe
 i686/xul.dll
 i686/nss3.dll
 i686/mozglue.dll
 i686/lgpllibs.dll
 i686/msvcp140.dll
 i686/vcruntime140.dll
 i686/gmp-clearkey/0.1/clearkey.dll
 [eme destdir="i686"]
 ; We assume the file we generate locally is the same as what was in the win32
 ; build, which, practically speaking, is the case.
 @BINPATH@/gmp-clearkey/0.1/manifest.json
 #endif
-
-#if defined(XP_WIN) && defined(MOZ_DEFAULT_BROWSER_AGENT)
-@BINPATH@/default-browser-agent@BIN_SUFFIX@
-#endif