Backed out changeset 6a5d823c5ae4 (bug 1579859) for causing build bustages CLOSED TREE
authorBogdan Tara <btara@mozilla.com>
Tue, 10 Sep 2019 00:10:40 +0300
changeset 553730 4a36a66e34128f517a7e5ba479b2d8849c4b9c5a
parent 553729 a396b80f331f42b5e82a25c45fd24b7ed41befcd
child 553731 1cdd736300d81e0c12de69b11411515d87896429
push id12169
push userffxbld-merge
push dateMon, 14 Oct 2019 16:59:29 +0000
treeherdermozilla-beta@c819687300ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1579859
milestone71.0a1
backs out6a5d823c5ae4baa5aae89d197915f1dfaf7d3c61
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
Backed out changeset 6a5d823c5ae4 (bug 1579859) for causing build bustages CLOSED TREE
modules/libjar/nsZipArchive.cpp
--- a/modules/libjar/nsZipArchive.cpp
+++ b/modules/libjar/nsZipArchive.cpp
@@ -336,36 +336,36 @@ nsresult nsZipArchive::OpenArchive(nsZip
 
   //-- get table of contents for archive
   nsresult rv = BuildFileList(aFd);
   if (NS_SUCCEEDED(rv)) {
     if (aZipHandle->mFile && XRE_IsParentProcess()) {
       static char* env = PR_GetEnv("MOZ_JAR_LOG_FILE");
       if (env) {
         zipLog.Init(env);
-        // We only log accesses in jar/zip archives within the gre directory
+        // We only log accesses in jar/zip archives within the NS_GRE_DIR
         // and/or the APK on Android. For the former, we log the archive path
-        // relative to the gre dir, and for the latter, the nested-archive
+        // relative to NS_GRE_DIR, and for the latter, the nested-archive
         // path within the APK. This makes the path match the path of the
         // archives relative to the packaged dist/$APP_NAME directory in a
         // build.
         if (aZipHandle->mFile.IsZip()) {
           // Nested archive, likely omni.ja in APK.
           aZipHandle->mFile.GetPath(mURI);
         } else if (nsDirectoryService::gService) {
           // We can reach here through the initialization of Omnijar from
           // XRE_InitCommandLine, which happens before the directory service
           // is initialized. When that happens, it means the opened archive is
           // the APK, and we don't care to log that one, so we just skip
           // when the directory service is not initialized.
           nsCOMPtr<nsIFile> dir = aZipHandle->mFile.GetBaseFile();
           nsCOMPtr<nsIFile> gre_dir;
           nsAutoCString path;
-          if (NS_SUCCEEDED(nsDirectoryService::gService->GetCurrentProcessDirectory(
-                  getter_AddRefs(gre_dir)))) {
+          if (NS_SUCCEEDED(nsDirectoryService::gService->Get(
+                  NS_GRE_DIR, NS_GET_IID(nsIFile), getter_AddRefs(gre_dir)))) {
             nsAutoCString leaf;
             nsCOMPtr<nsIFile> parent;
             while (NS_SUCCEEDED(dir->GetNativeLeafName(leaf)) &&
                    NS_SUCCEEDED(dir->GetParent(getter_AddRefs(parent)))) {
               if (!parent) {
                 break;
               }
               dir = parent;