Remove base conditional code for crash reporter and injector.

6 files changed, 3 insertions, 42 deletions

diff --git a/build/application.ini b/build/application.ini
index 6b2e43a344..e60f86b694 100644
--- a/build/application.ini
+++ b/build/application.ini
@@ -54,8 +54,3 @@ MaxVersion=@GRE_MILESTONE@
 EnableProfileMigrator=1
 #endif
 
-#if MOZ_CRASHREPORTER
-[Crash Reporter]
-Enabled=1
-ServerURL=https://crash-reports.mozilla.com/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSION@&buildid=@MOZ_BUILDID@
-#endif
diff --git a/build/automation-build.mk b/build/automation-build.mk
index e25f90c5d3..6599cb0324 100644
--- a/build/automation-build.mk
+++ b/build/automation-build.mk
@@ -48,11 +48,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 1c63977e83..83e7180376 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -230,7 +230,6 @@ class Automation(object):
 
     if crashreporter and not debugger:
       env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
-      env['MOZ_CRASHREPORTER'] = '1'
     else:
       env['MOZ_CRASHREPORTER_DISABLE'] = '1'
 
diff --git a/build/mobile/b2gautomation.py b/build/mobile/b2gautomation.py
index d73edd4198..e547bd6d20 100644
--- a/build/mobile/b2gautomation.py
+++ b/build/mobile/b2gautomation.py
@@ -157,7 +157,6 @@ class B2GRemoteAutomation(Automation):
             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.
diff --git a/build/mobile/remoteautomation.py b/build/mobile/remoteautomation.py
index 1358e0dfe3..26eedc85d6 100644
--- a/build/mobile/remoteautomation.py
+++ b/build/mobile/remoteautomation.py
@@ -76,7 +76,6 @@ class RemoteAutomation(Automation):
 
         if crashreporter and not debugger:
             env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
-            env['MOZ_CRASHREPORTER'] = '1'
         else:
             env['MOZ_CRASHREPORTER_DISABLE'] = '1'
 
@@ -215,36 +214,9 @@ class RemoteAutomation(Automation):
         if javaException:
             return True
 
-        # If crash reporting is disabled (MOZ_CRASHREPORTER!=1), we can't say
-        # anything.
-        if not self.CRASHREPORTER:
-            return False
+        # No crash reporting means we can't say anything.
+        return False
 
-        try:
-            dumpDir = tempfile.mkdtemp()
-            remoteCrashDir = posixpath.join(self._remoteProfile, 'minidumps')
-            if not self._devicemanager.dirExists(remoteCrashDir):
-                # If crash reporting is enabled (MOZ_CRASHREPORTER=1), the
-                # minidumps directory is automatically created when Fennec
-                # (first) starts, so its lack of presence is a hint that
-                # something went wrong.
-                print "Automation Error: No crash directory (%s) found on remote device" % remoteCrashDir
-                # Whilst no crash was found, the run should still display as a failure
-                return True
-            self._devicemanager.getDirectory(remoteCrashDir, dumpDir)
-
-            logger = get_default_logger()
-            if logger is not None:
-                crashed = mozcrash.log_crashes(logger, dumpDir, symbolsPath, test=self.lastTestSeen)
-            else:
-                crashed = Automation.checkForCrashes(self, dumpDir, symbolsPath)
-
-        finally:
-            try:
-                shutil.rmtree(dumpDir)
-            except:
-                print "WARNING: unable to remove directory: %s" % dumpDir
-        return crashed
 
     def buildCommandLine(self, app, debuggerInfo, profileDir, testURL, extraArgs):
         # If remote profile is specified, use that instead
diff --git a/build/moz.build b/build/moz.build
index 8d86b52bf9..f25e5cfa53 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -42,7 +42,7 @@ if CONFIG['MC_PALEMOON']:
 if CONFIG['MOZ_APP_PROFILE']:
     DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']
 
-for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR',
+for var in ('MOZ_PROFILE_MIGRATOR',
             'MOZ_APP_STATIC_INI'):
     if CONFIG[var]:
         DEFINES[var] = True