Bug 138009 - Remove unused platform.js, now with packaging goodness, …

…r=mossop
dothq · Apr 24, 2015 · 8cbff2f · 8cbff2f
1 parent ab4d405
commit 8cbff2f
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 49 deletions.
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
@@ -743,7 +743,6 @@
 #endif
 @RESPATH@/@PREF_DIR@/channel-prefs.js
 @RESPATH@/greprefs.js
-@RESPATH@/defaults/autoconfig/platform.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/defaults/profile/prefs.js
 

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -698,7 +698,6 @@
 @RESPATH@/browser/@PREF_DIR@/firefox.js
 @RESPATH@/browser/@PREF_DIR@/firefox-branding.js
 @RESPATH@/greprefs.js
-@RESPATH@/defaults/autoconfig/platform.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/profile/prefs.js
 

diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in
@@ -5,17 +5,3 @@
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
 		$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-AUTOCFG_JS_EXPORTS += $(srcdir)/mac/platform.js
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT), windows)
-AUTOCFG_JS_EXPORTS += $(srcdir)/win/platform.js
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT), beos)
-AUTOCFG_JS_EXPORTS += $(srcdir)/beos/platform.js
-else
-AUTOCFG_JS_EXPORTS += $(srcdir)/unix/platform.js
-endif
-endif
-endif
diff --git a/extensions/pref/autoconfig/src/beos/platform.js b/extensions/pref/autoconfig/src/beos/platform.js
diff --git a/extensions/pref/autoconfig/src/mac/platform.js b/extensions/pref/autoconfig/src/mac/platform.js
diff --git a/extensions/pref/autoconfig/src/nsReadConfig.cpp b/extensions/pref/autoconfig/src/nsReadConfig.cpp
@@ -158,11 +158,6 @@ nsresult nsReadConfig::readConfigFile()
         if (NS_FAILED(rv)) 
             return rv;
 
-        // Evaluate platform specific directives
-        rv = openAndEvaluateJSFile("platform.js", 0, false, false);
-        if (NS_FAILED(rv)) 
-            return rv;
-
         mRead = true;
     }
     // If the lockFileName is nullptr return ok, because no lockFile will be used

diff --git a/extensions/pref/autoconfig/src/prefcalls.js b/extensions/pref/autoconfig/src/prefcalls.js
@@ -10,9 +10,6 @@ const LDAPSyncQueryContractID = "@mozilla.org/ldapsyncquery;1";
 const nsIPrefService = Components.interfaces.nsIPrefService;
 const PrefServiceContractID = "@mozilla.org/preferences-service;1";
 
-// set on a platform specific basis in platform.js
-platform = { value: "" };
-
 var gVersion;
 
 function getPrefBranch() {

diff --git a/extensions/pref/autoconfig/src/unix/platform.js b/extensions/pref/autoconfig/src/unix/platform.js
diff --git a/extensions/pref/autoconfig/src/win/platform.js b/extensions/pref/autoconfig/src/win/platform.js
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
@@ -513,7 +513,6 @@
 @BINPATH@/@PREF_DIR@/mobile-branding.js
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 @BINPATH@/greprefs.js
-@BINPATH@/defaults/autoconfig/platform.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/defaults/profile/prefs.js