Bug 1799332: Stop bundling channel-prefs.js on macOS. r=bytesized

Differential Revision: https://phabricator.services.mozilla.com/D185834

Author: Stephen A Pohl

browser/app/Makefile.in

@@ -50,14 +50,17 @@ endif
 
 endif
 
-# channel-prefs.js is handled separate from other prefs due to bug 756325
+ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+
+# channel-prefs.js has been removed on macOS.
+# channel-prefs.js is handled separately from other prefs due to bug 756325.
 # DO NOT change the content of channel-prefs.js without taking the appropriate
 # steps. See bug 1431342.
 libs:: $(srcdir)/profile/channel-prefs.js
 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
 	$(call py_action,preprocessor channel-prefs.js,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
 
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+else
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
 

browser/installer/package-manifest.in

@@ -255,10 +255,13 @@
 @RESPATH@/browser/defaults/settings/main
 @RESPATH@/browser/defaults/settings/security-state
 
+# channel-prefs.js has been removed on macOS.
+#ifndef XP_MACOSX
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
+#endif
 
 ; Background tasks-specific preferences.
 ; These are in the GRE location since they apply to all tasks at this time.

browser/installer/removed-files.in

@@ -72,3 +72,9 @@
     @DIR_RESOURCES@chrome.manifest
   #endif
 #endif
+
+# channel-prefs.js has been removed on macOS.
+#ifdef XP_MACOSX
+@DIR_RESOURCES@defaults/pref/channel-prefs.js
+@DIR_RESOURCES@defaults/pref/
+#endif