bug 1161212 - Keep supporting binary XPCOM components from distribution bundles in B2G, because some partners use them to override builtin components. r=froydnj
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 04 May 2015 16:31:55 -0400
changeset 272453 2e20e099b6df332398372c4ee3af1e169774b874
parent 272452 1ab2d798c5bba382f0d9ce71cab7ed2aae1b7322
child 272454 53e602f840091e79970050b830f83285b2e2daf9
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1161212
milestone40.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 1161212 - Keep supporting binary XPCOM components from distribution bundles in B2G, because some partners use them to override builtin components. r=froydnj
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -662,17 +662,21 @@ nsXREDirProvider::LoadAppBundleDirs()
     return;
 
   nsCOMPtr<nsIFile> subdir;
   while (NS_SUCCEEDED(files->GetNextFile(getter_AddRefs(subdir))) && subdir) {
     mAppBundleDirectories.AppendObject(subdir);
 
     nsCOMPtr<nsIFile> manifest =
       CloneAndAppend(subdir, "chrome.manifest");
+#ifdef MOZ_B2G
+    XRE_AddManifestLocation(NS_APP_LOCATION, manifest);
+#else
     XRE_AddManifestLocation(NS_EXTENSION_LOCATION, manifest);
+#endif
   }
 }
 
 static const char *const kAppendPrefDir[] = { "defaults", "preferences", nullptr };
 
 #ifdef DEBUG_bsmedberg
 static void
 DumpFileArray(const char *key,