Commit 27550cf2 authored by Alex Franchuk's avatar Alex Franchuk Committed by afranchuk@mozilla.com
Browse files

Bug 1968241 - Clean up unnecessary crashreporter*.ini file logic r=nalexander

parent 194f9058
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -255,8 +255,6 @@ Environment variables used internally
- ``MOZ_CRASHREPORTER_RESTART_XUL_APP_FILE`` - If a XUL app file was specified
  when starting the app it has to be stored in this variable so that the crash
  reporter client can restart the application.
- ``MOZ_CRASHREPORTER_STRINGS_OVERRIDE`` - Overrides the path used to load the
  .ini file holding the strings used in the crash reporter client UI.

Environment variables used for development
------------------------------------------
+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ import buildconfig
# localized.
NON_CHROME = set(
    [
        "**/crashreporter*.ini",
        "dictionaries",
        "defaultagent_localized.ini",
        "defaults/profile",
+0 −19
Original line number Diff line number Diff line
@@ -4317,25 +4317,6 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
            getter_AddRefs(userAppDataDir)))) {
      CrashReporter::SetupExtraData(userAppDataDir,
                                    nsDependentCString(mAppData->buildID));

      // see if we have a crashreporter-override.ini in the application
      // directory
      nsCOMPtr<nsIFile> overrideini;
      if (NS_SUCCEEDED(
              mDirProvider.GetAppDir()->Clone(getter_AddRefs(overrideini))) &&
          NS_SUCCEEDED(
              overrideini->AppendNative("crashreporter-override.ini"_ns))) {
#ifdef XP_WIN
        nsAutoString overridePathW;
        overrideini->GetPath(overridePathW);
        NS_ConvertUTF16toUTF8 overridePath(overridePathW);
#else
        nsAutoCString overridePath;
        overrideini->GetNativePath(overridePath);
#endif

        SaveWordToEnv("MOZ_CRASHREPORTER_STRINGS_OVERRIDE", overridePath);
      }
    }
  } else {
    // We might have registered a runtime exception module very early in process