Backed out changeset c85784c39e28 (bug 1280470) for depending on a ba…

…cked out commit CLOSED TREE
Brli · Sep 16, 2016 · 7e1dc60 · 7e1dc60
1 parent b171eec
commit 7e1dc60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 41 deletions.
diff --git a/toolkit/crashreporter/google-breakpad/src/processor/moz.build b/toolkit/crashreporter/google-breakpad/src/processor/moz.build
@@ -4,63 +4,32 @@
 # 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'
+# We allow warnings for third-party code that can be updated from upstream.
+ALLOW_COMPILER_WARNINGS = True
 
-Library('breakpad_processor')
+FINAL_LIBRARY = 'xul'
 
-# Don't use the STL wrappers in the crashreporter clients
-DISABLE_STL_WRAPPING = True
+DEFINES['BP_LOGGING_INCLUDE'] = '"BreakpadLogging.h"'
 
-# We allow warnings for third-party code that can be updated from upstream.
-ALLOW_COMPILER_WARNINGS = True
+LOCAL_INCLUDES += [
+    '../../../breakpad-logging',
+]
 
 include('/toolkit/crashreporter/crashreporter.mozbuild')
diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build
@@ -9,7 +9,6 @@ SPHINX_TREES['crashreporter'] = 'docs'
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += [
         'google-breakpad/src/common',
-        'google-breakpad/src/processor',
         'breakpad-windows-libxul',
     ]
 
@@ -26,7 +25,6 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
         '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',
     ]
 
@@ -36,7 +34,6 @@ elif CONFIG['OS_ARCH'] == 'Linux':
         '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',
     ]