Bug 1105189 - Look for the distribution/bundles directory under Contents/Resources due to v2 signing requirements. r=bsmedberg
authorHector Zhao <bzhao@mozilla.com>
Wed, 26 Nov 2014 16:37:37 +0800
changeset 217688 21496e80b1fbe7c88039043e07252b44e91438eb
parent 217687 c337e74c88690efc462d74fa0f0e437a87588c08
child 217689 c6dc9a2f152c932b5b963bb33402dfb178da9a94
push id27887
push userryanvm@gmail.com
push dateThu, 27 Nov 2014 02:08:38 +0000
treeherdermozilla-central@c63e741bca2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1105189
milestone36.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 1105189 - Look for the distribution/bundles directory under Contents/Resources due to v2 signing requirements. r=bsmedberg
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -644,21 +644,20 @@ nsXREDirProvider::LoadExtensionBundleDir
   }
 }
 
 void
 nsXREDirProvider::LoadAppBundleDirs()
 {
   nsCOMPtr<nsIFile> dir;
   bool persistent = false;
-  nsresult rv = GetFile(XRE_EXECUTABLE_FILE, &persistent, getter_AddRefs(dir));
+  nsresult rv = GetFile(XRE_APP_DISTRIBUTION_DIR, &persistent, getter_AddRefs(dir));
   if (NS_FAILED(rv))
     return;
 
-  dir->SetNativeLeafName(NS_LITERAL_CSTRING("distribution"));
   dir->AppendNative(NS_LITERAL_CSTRING("bundles"));
 
   nsCOMPtr<nsISimpleEnumerator> e;
   rv = dir->GetDirectoryEntries(getter_AddRefs(e));
   if (NS_FAILED(rv))
     return;
 
   nsCOMPtr<nsIDirectoryEnumerator> files = do_QueryInterface(e);