diff --git a/Makefile.in b/Makefile.in index 849c96a7ae..54c5d5eb13 100644 --- a/Makefile.in +++ b/Makefile.in @@ -187,7 +187,6 @@ MAKE_SYM_STORE_ARGS := -c --vcs-info ifdef PDBSTR_PATH MAKE_SYM_STORE_ARGS += -i endif -DUMP_SYMS_BIN ?= $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms_vc$(_MSC_VER).exe # PDB files don't get moved to dist, so we need to scan the whole objdir MAKE_SYM_STORE_PATH := . endif diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 09f388c2e5..003329d757 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -8,13 +8,6 @@ include $(topsrcdir)/config/config.mk vpath %.xml @srcdir@/en-US/searchplugins vpath %.xml $(LOCALE_SRCDIR)/searchplugins -ifdef LOCALE_MERGEDIR -vpath crashreporter%.ini $(LOCALE_MERGEDIR)/browser/crashreporter -endif -vpath crashreporter%.ini $(LOCALE_SRCDIR)/crashreporter -ifdef LOCALE_MERGEDIR -vpath crashreporter%.ini @srcdir@/en-US/crashreporter -endif ifdef LOCALE_MERGEDIR vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile endif diff --git a/build/automation-build.mk b/build/automation-build.mk index 07dc67e207..dd9260b171 100644 --- a/build/automation-build.mk +++ b/build/automation-build.mk @@ -48,8 +48,6 @@ else AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0 endif -AUTOMATION_PPARGS += -DCRASHREPORTER=0 - ifdef MOZ_ASAN AUTOMATION_PPARGS += -DIS_ASAN=1 else diff --git a/build/automationutils.py b/build/automationutils.py index d428ffcef1..8879c60027 100644 --- a/build/automationutils.py +++ b/build/automationutils.py @@ -287,7 +287,7 @@ def systemMemory(): """ return int(os.popen("free").readlines()[1].split()[1]) -def environment(xrePath, env=None, crashreporter=True, debugger=False, dmdPath=None, lsanPath=None): +def environment(xrePath, env=None, debugger=False, dmdPath=None, lsanPath=None): """populate OS environment variables for mochitest""" env = os.environ.copy() if env is None else env @@ -327,16 +327,6 @@ def environment(xrePath, env=None, crashreporter=True, debugger=False, dmdPath=N if dmdPath and dmdLibrary and preloadEnvVar: env[preloadEnvVar] = os.path.join(dmdPath, dmdLibrary) - # crashreporter - env['GNOME_DISABLE_CRASH_DIALOG'] = '1' - env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1' - - if crashreporter and not debugger: - env['MOZ_CRASHREPORTER_NO_REPORT'] = '1' - env['MOZ_CRASHREPORTER'] = '1' - else: - env['MOZ_CRASHREPORTER_DISABLE'] = '1' - # Crash on non-local network connections by default. # MOZ_DISABLE_NONLOCAL_CONNECTIONS can be set to "0" to temporarily # enable non-local connections for the purposes of local testing. Don't diff --git a/build/docs/mozinfo.rst b/build/docs/mozinfo.rst index de745bcb8e..991581126e 100644 --- a/build/docs/mozinfo.rst +++ b/build/docs/mozinfo.rst @@ -65,13 +65,6 @@ buildapp For desktop Firefox, this is ``browser``. For Fennec, it's ``mobile/android``. For B2G, it's ``b2g``. -crashreporter - Whether the crash reporter is enabled for this build. - - Values are ``true`` and ``false``. - - Always defined. - datareporting Whether data reporting (MOZ_DATA_REPORTING) is enabled for this build. diff --git a/build/dumbmake-dependencies b/build/dumbmake-dependencies index cdb136d53b..23c90dd7d2 100644 --- a/build/dumbmake-dependencies +++ b/build/dumbmake-dependencies @@ -59,7 +59,6 @@ browser/app toolkit/components toolkit/components/jsdownloads toolkit/content - toolkit/crashreporter toolkit/devtools toolkit/forgetaboutsite toolkit/identity diff --git a/build/gen_mach_buildprops.py b/build/gen_mach_buildprops.py index 4cc025574b..16a8795ce8 100644 --- a/build/gen_mach_buildprops.py +++ b/build/gen_mach_buildprops.py @@ -45,8 +45,6 @@ def getUrlProperties(filename, package): # rather than a long if/else with duplicate code property_conditions = [ # key: property name, value: condition - ('symbolsUrl', lambda m: m.endswith('crashreporter-symbols.zip') or - m.endswith('crashreporter-symbols-full.zip')), ('testsUrl', lambda m: m.endswith(('tests.tar.bz2', 'tests.zip'))), ('unsignedApkUrl', lambda m: m.endswith('apk') and 'unsigned-unaligned' in m), diff --git a/build/mozconfig.common b/build/mozconfig.common index 3b49b819ec..84cbdf22bf 100644 --- a/build/mozconfig.common +++ b/build/mozconfig.common @@ -12,8 +12,6 @@ mk_add_options AUTOCLOBBER=1 -ac_add_options --enable-crashreporter - ac_add_options --enable-release . "$topsrcdir/build/mozconfig.automation" diff --git a/build/unix/mozconfig.asan b/build/unix/mozconfig.asan index 7abc4f6bb4..d80014f265 100644 --- a/build/unix/mozconfig.asan +++ b/build/unix/mozconfig.asan @@ -21,7 +21,6 @@ export MOZ_DEBUG_SYMBOLS=1 ac_add_options --enable-debug-symbols ac_add_options --disable-install-strip ac_add_options --disable-jemalloc -ac_add_options --disable-crashreporter ac_add_options --disable-elf-hack # Avoid dependency on libstdc++ 4.7 diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in index 664eca5257..3e61d725c0 100644 --- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -25,5 +25,3 @@ endif # WIN32_REDIST_DIR # run the binscope tool to make sure the binary and all libraries # are using all available Windows OS-level security mechanisms check:: - $(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/crashreporter-symbols/ - $(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/plugin-container.exe $(DIST)/crashreporter-symbols/ diff --git a/ipc/glue/GoannaChildProcessHost.cpp b/ipc/glue/GoannaChildProcessHost.cpp index dcffd3d8f2..c89674587d 100644 --- a/ipc/glue/GoannaChildProcessHost.cpp +++ b/ipc/glue/GoannaChildProcessHost.cpp @@ -21,8 +21,6 @@ #include "prenv.h" #include "nsXPCOMPrivate.h" -#include "nsExceptionHandler.h" - #include "nsDirectoryServiceDefs.h" #include "nsIFile.h" @@ -50,9 +48,8 @@ using mozilla::MonitorAutoLock; using mozilla::ipc::GoannaChildProcessHost; #ifdef ANDROID -// Like its predecessor in nsExceptionHandler.cpp, this is -// the magic number of a file descriptor remapping we must -// preserve for the child process. +// This is the magic number of a file descriptor +// remapping we must preserve for the child process. static const int kMagicAndroidSystemPropFd = 5; #endif diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index 091b4c3302..1bd847d19f 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -160,10 +160,6 @@ for var in ('MOZ_CHILD_PROCESS_NAME', 'MOZ_CHILD_PROCESS_BUNDLE', 'DLL_PREFIX', 'DLL_SUFFIX'): DEFINES[var] = '"%s"' % CONFIG[var] -LOCAL_INCLUDES += [ - '/toolkit/crashreporter', -] - if CONFIG['OS_ARCH'] == 'WINNT': LOCAL_INCLUDES += [ '/security/sandbox/win/src/sandboxbroker', diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index ac58f1d9d8..93a71a0e7a 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -2375,9 +2375,6 @@ pref("dom.ipc.plugins.java.enabled", false); pref("dom.ipc.plugins.flash.disable-protected-mode", false); -pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", true); -pref("dom.ipc.plugins.reportCrashURL", true); - // How long we wait before unloading an idle plugin process. // Defaults to 30 seconds. pref("dom.ipc.plugins.unloadTimeoutSecs", 30); diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index b02297a55e..7461eec6bd 100755 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -78,7 +78,6 @@ def build_dict(config, env=os.environ): # other CPUs will wind up with unknown bits d['debug'] = substs.get('MOZ_DEBUG') == '1' - d['crashreporter'] = bool(substs.get('MOZ_CRASHREPORTER')) d['datareporting'] = bool(substs.get('MOZ_DATA_REPORTING')) d['healthreport'] = substs.get('MOZ_SERVICES_HEALTHREPORT') == '1' d['asan'] = substs.get('MOZ_ASAN') == '1' diff --git a/services/healthreport/modules-testing/utils.jsm b/services/healthreport/modules-testing/utils.jsm index bad2f6c8cc..acadce8dfb 100644 --- a/services/healthreport/modules-testing/utils.jsm +++ b/services/healthreport/modules-testing/utils.jsm @@ -92,8 +92,6 @@ this.updateAppInfo = function (obj) { * Currently, we just create a dummy file. A more robust implementation would * create something that actually resembles a crash report file. * - * This is very similar to code in crashreporter/tests/browser/head.js. - * * FUTURE consolidate code in a shared JSM. */ this.createFakeCrash = function (submitted=false, date=new Date()) { diff --git a/toolkit/content/license.html b/toolkit/content/license.html index b0b5f7066e..cdc0f318ab 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -2367,9 +2367,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This license applies to files in the directories - toolkit/crashreporter/google-breakpad/, - camino/google-breakpad/ and +
This license applies to files in the directory toolkit/components/protobuf/.
diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in
index e1299c0445..8b2ac1d348 100644
--- a/toolkit/locales/Makefile.in
+++ b/toolkit/locales/Makefile.in
@@ -6,14 +6,6 @@ XULPPFLAGS += -I$(LOCALE_SRCDIR)/defines.inc
include $(topsrcdir)/config/rules.mk
-ifdef LOCALE_MERGEDIR
-vpath crashreporter.% $(LOCALE_MERGEDIR)/toolkit/crashreporter
-endif
-vpath crashreporter.% $(LOCALE_SRCDIR)/crashreporter
-ifdef LOCALE_MERGEDIR
-vpath crashreporter.% @srcdir@/en-US/crashreporter
-endif
-
libs-%:
@$(MAKE) -C ../../netwerk/locales/ libs AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../dom/locales/ libs AB_CD=$* XPI_NAME=locale-$*
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index b8984f12c0..566825d4b0 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -74,8 +74,6 @@
locale/@AB_CD@/global/webapps.properties (%chrome/global/webapps.properties)
locale/@AB_CD@/global/wizard.dtd (%chrome/global/wizard.dtd)
locale/@AB_CD@/global/wizard.properties (%chrome/global/wizard.properties)
- locale/@AB_CD@/global/crashes.dtd (%crashreporter/crashes.dtd)
- locale/@AB_CD@/global/crashes.properties (%crashreporter/crashes.properties)
% locale global-region @AB_CD@ %locale/@AB_CD@/global-region/
locale/@AB_CD@/global-region/region.properties (%chrome/global-region/region.properties)
% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/
diff --git a/toolkit/mozapps/installer/l10n-repack.py b/toolkit/mozapps/installer/l10n-repack.py
index 783c00b71c..476603925b 100644
--- a/toolkit/mozapps/installer/l10n-repack.py
+++ b/toolkit/mozapps/installer/l10n-repack.py
@@ -14,7 +14,6 @@ import buildconfig
# Set of files or directories not listed in a chrome.manifest but that are
# localized.
NON_CHROME = set([
- '**/crashreporter*.ini',
'searchplugins',
'dictionaries',
'hyphenation',
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index a95ae7e6ba..81bb56a093 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -122,8 +122,8 @@ PKG_SRCPACK_PATH = source/
endif # MOZ_PKG_PRETTYNAMES
# Symbol package naming
-SYMBOL_FULL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols-full
-SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
+SYMBOL_FULL_ARCHIVE_BASENAME = $(PKG_BASENAME).crash-symbols-full
+SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crash-symbols
# Code coverage package naming
CODE_COVERAGE_ARCHIVE_BASENAME = $(PKG_BASENAME).code-coverage-gcno
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index 89675fcc47..037da6f7ba 100644
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -153,7 +153,6 @@ LOCAL_INCLUDES += [
'/dom/base',
'/dom/ipc',
'/testing/gtest/mozilla',
- '/toolkit/crashreporter',
'/xpcom/build',
]
diff --git a/toolkit/xre/nsAndroidStartup.cpp b/toolkit/xre/nsAndroidStartup.cpp
index df97f33927..d6f03a8ed2 100644
--- a/toolkit/xre/nsAndroidStartup.cpp
+++ b/toolkit/xre/nsAndroidStartup.cpp
@@ -17,7 +17,6 @@
#include "nsAppRunner.h"
#include "AndroidBridge.h"
#include "APKOpen.h"
-#include "nsExceptionHandler.h"
#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, MOZ_APP_NAME, args)
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 048af4dff0..b6b4598176 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -35,7 +35,6 @@
#include "nsAppRunner.h"
#include "nsAutoRef.h"
#include "nsDirectoryServiceDefs.h"
-#include "nsExceptionHandler.h"
#include "nsString.h"
#include "nsThreadUtils.h"
#include "nsJSUtils.h"
diff --git a/toolkit/xre/nsX11ErrorHandler.cpp b/toolkit/xre/nsX11ErrorHandler.cpp
index 5e254d989e..7c9591ea2b 100644
--- a/toolkit/xre/nsX11ErrorHandler.cpp
+++ b/toolkit/xre/nsX11ErrorHandler.cpp
@@ -7,7 +7,6 @@
#include "prenv.h"
#include "nsXULAppAPI.h"
-#include "nsExceptionHandler.h"
#include "nsDebug.h"
#include "mozilla/X11Util.h"
diff --git a/toolkit/xre/test/win/TestDllInterceptor.cpp b/toolkit/xre/test/win/TestDllInterceptor.cpp
index 3381da012f..48d17e8e79 100644
--- a/toolkit/xre/test/win/TestDllInterceptor.cpp
+++ b/toolkit/xre/test/win/TestDllInterceptor.cpp
@@ -150,8 +150,6 @@ int main()
TestHook("ntdll.dll", "NtWriteFile") &&
TestHook("ntdll.dll", "NtWriteFileGather") &&
TestHook("ntdll.dll", "NtQueryFullAttributesFile") &&
- // Bug 733892: toolkit/crashreporter/nsExceptionHandler.cpp
- TestHook("kernel32.dll", "SetUnhandledExceptionFilter") &&
#ifdef _M_IX86
// Bug 670967: xpcom/base/AvailableMemoryTracker.cpp
TestHook("kernel32.dll", "VirtualAlloc") &&
diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build
index 7b1b8f5fe7..775d9a90d4 100644
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -86,16 +86,9 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
'/docshell/base',
'/ipc/chromium/src',
'/mozglue/linker',
- '/toolkit/crashreporter/google-breakpad/src',
'/xpcom/base',
]
- # We need access to Breakpad's getcontext(3) which is suitable for Android
- if CONFIG['OS_TARGET'] == 'Android':
- LOCAL_INCLUDES += [
- '/toolkit/crashreporter/google-breakpad/src/common/android/include',
- ]
-
if CONFIG['ANDROID_CPU_ARCH'] == 'armeabi':
DEFINES['ARCH_ARMV6'] = True
diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build
index d9c8b0ec13..b090322f74 100644
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -55,7 +55,6 @@ MSVC_ENABLE_PGO = True
LOCAL_INCLUDES += [
'../build',
'/caps',
- '/toolkit/crashreporter/google-breakpad/src',
'/tools/profiler',
]
diff --git a/xulrunner/config/mozconfigs/linux32/xulrunner-qt b/xulrunner/config/mozconfigs/linux32/xulrunner-qt
index 209603ebf2..e04b4c6dac 100644
--- a/xulrunner/config/mozconfigs/linux32/xulrunner-qt
+++ b/xulrunner/config/mozconfigs/linux32/xulrunner-qt
@@ -13,6 +13,5 @@ ac_add_options --disable-tests
export PKG_CONFIG_PATH=/tools/qt-4.6.3/qt/lib/pkgconfig
ac_add_options --with-qtdir=/tools/qt-4.6.3/qt
ac_add_options --enable-default-toolkit=cairo-qt
-ac_add_options --disable-crashreporter
. "$topsrcdir/xulrunner/config/mozconfigs/common.override"