Skip to content

Commit be58cf7

Browse files
author
Stephen A Pohl
committed
Bug 1799332: Stop bundling channel-prefs.js on macOS. r=bytesized
Differential Revision: https://phabricator.services.mozilla.com/D185834
1 parent b4aeb62 commit be58cf7

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

browser/app/Makefile.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,17 @@ endif
5050

5151
endif
5252

53-
# channel-prefs.js is handled separate from other prefs due to bug 756325
53+
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
54+
55+
# channel-prefs.js has been removed on macOS.
56+
# channel-prefs.js is handled separately from other prefs due to bug 756325.
5457
# DO NOT change the content of channel-prefs.js without taking the appropriate
5558
# steps. See bug 1431342.
5659
libs:: $(srcdir)/profile/channel-prefs.js
5760
$(NSINSTALL) -D $(DIST)/bin/defaults/pref
5861
$(call py_action,preprocessor channel-prefs.js,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
5962

60-
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
63+
else
6164

6265
MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
6366

browser/installer/package-manifest.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,13 @@
255255
@RESPATH@/browser/defaults/settings/main
256256
@RESPATH@/browser/defaults/settings/security-state
257257

258+
# channel-prefs.js has been removed on macOS.
259+
#ifndef XP_MACOSX
258260
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
259261
; Technically this is an app pref file, but we are keeping it in the original
260262
; gre location for now.
261263
@RESPATH@/defaults/pref/channel-prefs.js
264+
#endif
262265

263266
; Background tasks-specific preferences.
264267
; These are in the GRE location since they apply to all tasks at this time.

browser/installer/removed-files.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,9 @@
7272
@DIR_RESOURCES@chrome.manifest
7373
#endif
7474
#endif
75+
76+
# channel-prefs.js has been removed on macOS.
77+
#ifdef XP_MACOSX
78+
@DIR_RESOURCES@defaults/pref/channel-prefs.js
79+
@DIR_RESOURCES@defaults/pref/
80+
#endif

0 commit comments

Comments
 (0)