Roll Breakpad to release 1020
This brings in fixes to the Android unit tests.
You can quickly test this with:
. build/android/envsetup.sh
GYP_DEFINES="$GYP_DEFINES linux_breakpad=1"
android_gyp
make out/Debug/breakpad_unittests
adb push out/Debug/breakpad_unittests /data/local/tmp/breakpad_unittests
adb shell /data/local/tmp/breakpad_unittests
BUG=
Review URL: https://chromiumcodereview.appspot.com/10875048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153653 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/DEPS b/DEPS
index 736acc3..144b3a9 100644
--- a/DEPS
+++ b/DEPS
@@ -41,7 +41,7 @@
deps = {
"src/breakpad/src":
- (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1015",
+ (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1020",
"src/googleurl":
(Var("googlecode_url") % "google-url") + "/trunk@178",
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index 1cc4e43..a5c02fcc 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -372,6 +372,7 @@
{
'target_name': 'symupload',
'type': 'executable',
+ 'toolsets': [ 'host', ],
# This uses the system libcurl, so don't use the default 32-bit
# compile flags when building on a 64-bit machine.
@@ -398,6 +399,7 @@
],
'include_dirs': [
'src',
+ 'src/third_party',
],
'link_settings': {
'libraries': [
@@ -527,10 +529,14 @@
'cflags': ['-Wa,-mimplicit-it=always'],
}],
['OS=="android"', {
- 'sources!':[
- 'src/common/linux/elf_core_dump.cc',
- 'src/common/linux/elf_core_dump.h',
+ 'include_dirs': [
+ 'src/common/android/include',
],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ 'src/common/android/include',
+ ],
+ },
}],
],
@@ -621,6 +627,14 @@
'-Wno-unused-value',
],
}],
+ ['OS=="android"', {
+ 'libraries': [
+ '-llog',
+ ],
+ 'include_dirs': [
+ 'src/common/android/include',
+ ],
+ }],
],
},
{
