diff options
| author | digit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 10:43:44 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 10:43:44 +0000 |
| commit | 32c5dd98bebfee82c1fcc056c5f740db7c9ae17e (patch) | |
| tree | b867ca7475e7113df72d14a37bc8ed14c44b8b12 /breakpad/breakpad.gyp | |
| parent | c43633be3fc9745de801dac02bf3475672677069 (diff) | |
| download | chromium_src-32c5dd98bebfee82c1fcc056c5f740db7c9ae17e.zip chromium_src-32c5dd98bebfee82c1fcc056c5f740db7c9ae17e.tar.gz chromium_src-32c5dd98bebfee82c1fcc056c5f740db7c9ae17e.tar.bz2 | |
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
Diffstat (limited to 'breakpad/breakpad.gyp')
| -rw-r--r-- | breakpad/breakpad.gyp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 1cc4e43..a5c02fc 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', + ], + }], ], }, { |