Backed out changeset c85784c39e28 (bug 1280470) for depending on a backed out commit
authorPhil Ringnalda <philringnalda@gmail.com>
Thu, 15 Sep 2016 19:16:17 -0700
changeset 414340 edfff7a9e4c43f6d516dfbf69a64e205e5cdb699
parent 414339 4c5820c29259b5e295dc264a33d65566808a4fc2
child 414341 684753e4dc408f08ceb8aadcb0c5f320c7edcfae
child 414355 6b4c1300d5315296a0ee94ce8cff3e0017881875
child 414370 b58ca92f8478539219cd0c1db5dff7a5b354ebca
child 414401 dd0619214bc367e85630a917a95de4d3db9ed9b6
child 414405 d15334ae7f0998576583248f5c0edccf9abafa1b
child 414408 a3c44741901cdfa277caad8a6ce42b83143f3f66
child 414444 09a13815bd25dc332bb32a559b3969a35ebbb55f
child 414482 9257cddfc4e72040317c0d1e060144f8ca3863df
child 414484 67513592c9e35469ee0dc1c5e046930e2e5f1f6c
child 414488 1fc3a86169e83fd1d342c391dd3e9c5b137022e2
child 414511 6547ad51c69b4d5e3a394f0e2475231191625f90
push id29643
push usergsquelart@mozilla.com
push dateFri, 16 Sep 2016 05:17:49 +0000
bugs1280470
milestone51.0a1
backs outc85784c39e283cac53c15d687771c40aefc9cdeb
Backed out changeset c85784c39e28 (bug 1280470) for depending on a backed out commit CLOSED TREE
toolkit/crashreporter/google-breakpad/src/processor/moz.build
toolkit/crashreporter/moz.build
--- a/toolkit/crashreporter/google-breakpad/src/processor/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/processor/moz.build
@@ -1,66 +1,35 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-SOURCES += [
-    '../third_party/libdisasm/ia32_invariant.c',
-    'disassembler_x86.cc',
-    'exploitability_win.cc',
-]
-
 UNIFIED_SOURCES += [
-    '../third_party/libdisasm/ia32_implicit.c',
-    '../third_party/libdisasm/ia32_insn.c',
-    '../third_party/libdisasm/ia32_modrm.c',
-    '../third_party/libdisasm/ia32_opcode_tables.c',
-    '../third_party/libdisasm/ia32_operand.c',
-    '../third_party/libdisasm/ia32_reg.c',
-    '../third_party/libdisasm/ia32_settings.c',
-    '../third_party/libdisasm/x86_disasm.c',
-    '../third_party/libdisasm/x86_imm.c',
-    '../third_party/libdisasm/x86_insn.c',
-    '../third_party/libdisasm/x86_misc.c',
-    '../third_party/libdisasm/x86_operand_list.c',
     'basic_code_modules.cc',
     'basic_source_line_resolver.cc',
     'call_stack.cc',
     'cfi_frame_info.cc',
-    'dump_context.cc',
-    'dump_object.cc',
-    'exploitability.cc',
-    'exploitability_linux.cc',
-    'logging.cc',
     'minidump.cc',
-    'minidump_processor.cc',
-    'pathname_stripper.cc',
-    'proc_maps_linux.cc',
-    'process_state.cc',
     'source_line_resolver_base.cc',
     'stack_frame_symbolizer.cc',
-    'stackwalk_common.cc',
     'stackwalker.cc',
     'stackwalker_amd64.cc',
     'stackwalker_arm.cc',
-    'stackwalker_arm64.cc',
-    'stackwalker_mips.cc',
     'stackwalker_ppc.cc',
-    'stackwalker_ppc64.cc',
     'stackwalker_sparc.cc',
     'stackwalker_x86.cc',
-    'symbolic_constants_win.cc',
     'tokenize.cc',
 ]
 
-DEFINES['BPLOG_MINIMUM_SEVERITY'] = 'SEVERITY_ERROR'
-
-Library('breakpad_processor')
-
-# Don't use the STL wrappers in the crashreporter clients
-DISABLE_STL_WRAPPING = True
-
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
+FINAL_LIBRARY = 'xul'
+
+DEFINES['BP_LOGGING_INCLUDE'] = '"BreakpadLogging.h"'
+
+LOCAL_INCLUDES += [
+    '../../../breakpad-logging',
+]
+
 include('/toolkit/crashreporter/crashreporter.mozbuild')
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -4,44 +4,41 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SPHINX_TREES['crashreporter'] = 'docs'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += [
         'google-breakpad/src/common',
-        'google-breakpad/src/processor',
         'breakpad-windows-libxul',
     ]
 
     if CONFIG['MSVC_HAS_DIA_SDK']:
         DIRS += ['google-breakpad/src/tools/windows/dump_syms']
 
     if CONFIG['MOZ_CRASHREPORTER_INJECTOR']:
         DIRS += ['breakpad-windows-standalone']
 
 elif CONFIG['OS_ARCH'] == 'Darwin':
     DIRS += [
         'google-breakpad/src/common',
         'google-breakpad/src/common/mac',
         'google-breakpad/src/client',
         'google-breakpad/src/client/mac/crash_generation',
         'google-breakpad/src/client/mac/handler',
-        'google-breakpad/src/processor',
         'google-breakpad/src/tools/mac/dump_syms',
     ]
 
 elif CONFIG['OS_ARCH'] == 'Linux':
     DIRS += [
         'google-breakpad/src/common',
         'google-breakpad/src/common/linux',
         'google-breakpad/src/client',
         'google-breakpad/src/client/linux/',
-        'google-breakpad/src/processor',
         'google-breakpad/src/tools/linux/dump_syms',
     ]
 
 elif CONFIG['OS_ARCH'] == 'SunOS':
     DIRS += [
         'google-breakpad/src/common',
         'google-breakpad/src/common/solaris',
         'google-breakpad/src/client',