diff options
| author | Pale Moon <git-repo@palemoon.org> | 2015-02-01 15:44:21 +0100 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2015-02-01 15:44:21 +0100 |
| commit | f7489c35f24b4ce10f9645b5edc3e97a6e0017b3 (patch) | |
| tree | d2c04877360a2962ed2ec42c6bf4b781ef1b29a0 /build | |
| parent | 811d05df9f7b7f520a96a719dcfc24244b8b204e (diff) | |
| download | palemoon-gre-f7489c35f24b4ce10f9645b5edc3e97a6e0017b3.tar.gz | |
Remove conditional crash reporter code
Diffstat (limited to 'build')
| -rw-r--r-- | build/automation-build.mk | 4 | ||||
| -rw-r--r-- | build/automation.py.in | 6 | ||||
| -rw-r--r-- | build/mobile/b2gautomation.py | 4 | ||||
| -rw-r--r-- | build/mobile/remoteautomation.py | 6 |
4 files changed, 2 insertions, 18 deletions
diff --git a/build/automation-build.mk b/build/automation-build.mk index 1d1004212..eca32f71b 100644 --- a/build/automation-build.mk +++ b/build/automation-build.mk @@ -54,11 +54,7 @@ else AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0 endif -ifdef MOZ_CRASHREPORTER -AUTOMATION_PPARGS += -DCRASHREPORTER=1 -else AUTOMATION_PPARGS += -DCRASHREPORTER=0 -endif ifdef MOZ_ASAN AUTOMATION_PPARGS += -DIS_ASAN=1 diff --git a/build/automation.py.in b/build/automation.py.in index f3d75590c..594955ab6 100644 --- a/build/automation.py.in +++ b/build/automation.py.in @@ -736,11 +736,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t elif self.IS_WIN32: env["PATH"] = env["PATH"] + ";" + ldLibraryPath - if crashreporter: - env['MOZ_CRASHREPORTER_NO_REPORT'] = '1' - env['MOZ_CRASHREPORTER'] = '1' - else: - env['MOZ_CRASHREPORTER_DISABLE'] = '1' + env['MOZ_CRASHREPORTER_DISABLE'] = '1' env['GNOME_DISABLE_CRASH_DIALOG'] = '1' env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1' diff --git a/build/mobile/b2gautomation.py b/build/mobile/b2gautomation.py index 047a19128..06654f3e6 100644 --- a/build/mobile/b2gautomation.py +++ b/build/mobile/b2gautomation.py @@ -82,10 +82,6 @@ class B2GRemoteAutomation(Automation): if env is None: env = {} - if crashreporter: - env['MOZ_CRASHREPORTER'] = '1' - env['MOZ_CRASHREPORTER_NO_REPORT'] = '1' - # We always hide the results table in B2G; it's much slower if we don't. env['MOZ_HIDE_RESULTS_TABLE'] = '1' return env diff --git a/build/mobile/remoteautomation.py b/build/mobile/remoteautomation.py index 973d6a365..2ebad37b7 100644 --- a/build/mobile/remoteautomation.py +++ b/build/mobile/remoteautomation.py @@ -58,11 +58,7 @@ class RemoteAutomation(Automation): if 'MOZ_HIDE_RESULTS_TABLE' in os.environ: env['MOZ_HIDE_RESULTS_TABLE'] = os.environ['MOZ_HIDE_RESULTS_TABLE'] - if crashreporter: - env['MOZ_CRASHREPORTER_NO_REPORT'] = '1' - env['MOZ_CRASHREPORTER'] = '1' - else: - env['MOZ_CRASHREPORTER_DISABLE'] = '1' + env['MOZ_CRASHREPORTER_DISABLE'] = '1' return env |