author Ted Mielczarek <>
Wed, 27 Jan 2016 09:39:53 -0500
changeset 319829 62a0d8c93da2ca24f3f87642a2989c4741f214d4
parent 318673 9087dd73457a98ccf303d0e2613135f31fc172c9
permissions -rw-r--r--
bug 1069556 - sync to Breakpad c53ed143108948eb7e2d7ee77dc8c0d92050ce7c. r=glandium, benwa This commit contains a few things: * Update our copy of google-breakpad to upstream c53ed143108948eb7e2d7ee77dc8c0d92050ce7c * Get rid of all but one local patch, fold a few related local patches into one * Misc build fixup to sync with upstream--adding a few new files, source files * The final bits of unhooking Breakpad from the profiler: ** Revert to only building toolkit/crashreporter if MOZ_CRASHREPORTER. ** Stop building bits of Breakpad that we only needed for the profiler. ** Remove a few bits of profiler code that were used to interface with Breakpad. ** Remove toolkit/crashreporter/breakpad-logging, which was only used to suppress Breakpad logging for the in-process stackwalker. * Upstream removed their Android-compat sys/ucontext.h because the Android NDK added it, but the bionic we're using for Gonk builds is too old, so add a copy of the previous version of those files to toolkit/crashreporter/gonk-include to keep Gonk building. * Consolidate files under toolkit/crashreporter/google-breakpad/client/linux

# 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

ifeq (Android,$(OS_TARGET))
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/gonk-include/
TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/

include $(topsrcdir)/config/