summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--browser/components/BrowserComponents.manifest2
-rw-r--r--browser/installer/Makefile.in4
-rw-r--r--browser/installer/package-manifest.in4
-rw-r--r--js/xpconnect/loader/mozJSComponentLoader.cpp8
-rw-r--r--old-configure.in5
-rwxr-xr-xpython/mozbuild/mozbuild/mozinfo.py4
6 files changed, 1 insertions, 26 deletions
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
index dbfc3d2ec..0c80006be 100644
--- a/browser/components/BrowserComponents.manifest
+++ b/browser/components/BrowserComponents.manifest
@@ -39,6 +39,4 @@ component {eab9012e-5f74-4cbc-b2b5-a590235513cc} nsBrowserGlue.js
contract @mozilla.org/browser/browserglue;1 {eab9012e-5f74-4cbc-b2b5-a590235513cc}
category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314}
component {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} nsBrowserGlue.js
-#ifndef MOZ_MULET
contract @mozilla.org/content-permission/prompt;1 {d8903bf6-68d5-4e97-bcd1-e4d3012f721a}
-#endif
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
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index 95c214867..85591bc8a 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -306,14 +306,6 @@ mozJSComponentLoader::ReallyInit()
mReuseLoaderGlobal = Preferences::GetBool("jsloader.reuseGlobal");
- // XXXkhuey B2G child processes have some sort of preferences race that
- // results in getting the wrong value.
- // But we don't want that on Firefox Mulet as it break most Firefox JSMs...
- // Also disable on debug builds to break js components that rely on this.
-#if defined(MOZ_B2G) && !defined(MOZ_MULET) && !defined(DEBUG)
- mReuseLoaderGlobal = true;
-#endif
-
nsCOMPtr<nsIScriptSecurityManager> secman =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
if (!secman)
diff --git a/old-configure.in b/old-configure.in
index b257a9efd..a67e65ce7 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2425,10 +2425,6 @@ if test -n "$MOZ_GRAPHENE"; then
AC_DEFINE(MOZ_GRAPHENE)
fi
-if test -n "$MOZ_MULET"; then
- AC_DEFINE(MOZ_MULET)
-fi
-
# Propagate feature switches for code written in rust from confvars.sh
if test -n "$MOZ_RUST"; then
if test -n "$MOZ_RUST_MP4PARSE"; then
@@ -2441,7 +2437,6 @@ fi
AC_SUBST(MOZ_XULRUNNER)
AC_SUBST(MOZ_B2G)
-AC_SUBST(MOZ_MULET)
AC_SUBST(MOZ_B2G_VERSION)
dnl ========================================================
diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py
index f0b0df9bb..2c08c4e9f 100755
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -52,9 +52,7 @@ def build_dict(config, env=os.environ):
d["appname"] = substs["MOZ_APP_NAME"]
# Build app name
- if 'MOZ_MULET' in substs and substs.get('MOZ_MULET') == "1":
- d["buildapp"] = "mulet"
- elif 'MOZ_BUILD_APP' in substs:
+ if 'MOZ_BUILD_APP' in substs:
d["buildapp"] = substs["MOZ_BUILD_APP"]
# processor