Update crashpad. (#3130)

Update crashpad and bump version.

Author: mrober

firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_client/Android.mk

@@ -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 \
 

firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_handler_lib/Android.mk

@@ -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 \

firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk

@@ -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 \
 

firebase-crashlytics-ndk/src/main/jni/crashpad/mini_chromium_base/Android.mk

@@ -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 \

firebase-crashlytics-ndk/src/main/jni/libchrome/include/build/chromeos_buildflags.h

@@ -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
+

firebase-crashlytics-ndk/src/main/jni/libcrashlytics-common/Android.mk

@@ -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 := \

firebase-crashlytics-ndk/src/main/jni/libcrashlytics-common/include/crashlytics/version.h

@@ -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__