diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 20 |
2 files changed, 18 insertions, 4 deletions
@@ -41,7 +41,7 @@ vars = { 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..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', + ], + }], ], }, { |