Skip to content

Update crashpad. #3130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2021
Merged

Update crashpad. #3130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41b4513
Update crashpad.
mrober Nov 11, 2021
38caa60
Version bump.
mrober Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_client/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include $(CLEAR_VARS)

LOCAL_MODULE := crashpad_client
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../libchrome/include \
$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/.. \
$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad \

Expand Down
5 changes: 4 additions & 1 deletion firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_handler_lib/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ THIRD_PARTY_PATH := ../../../../third_party
include $(CLEAR_VARS)

LOCAL_MODULE := crashpad_handler_lib
LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../libchrome/include \
$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad \

LOCAL_CPPFLAGS := \
-D_FILE_OFFSET_BITS=64 \
-DCRASHPAD_ZLIB_SOURCE_SYSTEM \
Expand Down
1 change: 1 addition & 0 deletions firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include $(CLEAR_VARS)

LOCAL_MODULE := crashpad_util
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../libchrome/include \
$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/.. \
$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad \

Expand Down
3 changes: 1 addition & 2 deletions firebase-crashlytics-ndk/src/main/jni/crashpad/mini_chromium_base/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ LOCAL_SRC_FILES := \
$(THIRD_PARTY_PATH)/mini_chromium/base/files/file_util_posix.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/files/scoped_file.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/logging.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/memory/page_size_posix.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/posix/safe_strerror.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/process/memory.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/process/process_metrics_posix.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/rand_util.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/strings/string16.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/strings/string_number_conversions.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/strings/string_util.cc \
$(THIRD_PARTY_PATH)/mini_chromium/base/strings/stringprintf.cc \
Expand Down
11 changes: 11 additions & 0 deletions firebase-crashlytics-ndk/src/main/jni/libchrome/include/build/chromeos_buildflags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#ifndef BUILD_CHROMEOS_BUILDFLAGS_H_
#define BUILD_CHROMEOS_BUILDFLAGS_H_

#include "build/buildflag.h"

#define BUILDFLAG_INTERNAL_IS_CHROMEOS_DEVICE() (0)
#define BUILDFLAG_INTERNAL_IS_CHROMEOS_LACROS() (0)
#define BUILDFLAG_INTERNAL_IS_CHROMEOS_ASH() (0)

#endif

2 changes: 2 additions & 0 deletions firebase-crashlytics-ndk/src/main/jni/libcrashlytics-common/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ LOCAL_MODULE := crashlytics-common
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../libcrashlytics/include \
$(LOCAL_PATH)/../libchrome/include \
$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad \
$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/mini_chromium \

LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CPPFLAGS := \
Expand Down
2 changes: 1 addition & 1 deletion firebase-crashlytics-ndk/src/main/jni/libcrashlytics-common/include/crashlytics/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
#define __CRASHLYTICS_VERSION_H__

//! Authoritative libcrashlytics version string.
#define VERSION "3.1.0"
#define VERSION "3.2.0"

#endif // __CRASHLYTICS_VERSION_H__
2 changes: 1 addition & 1 deletion firebase-crashlytics-ndk/src/third_party/crashpad
Open in desktop
Submodule crashpad updated from 36d4bb to 4bf79b
2 changes: 1 addition & 1 deletion firebase-crashlytics-ndk/src/third_party/mini_chromium
Open in desktop
Submodule mini_chromium updated from 76a9bb to 461b41