Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1757)

Unified Diff: build/common.gypi

Issue 9838033: Upstream native crash handling changes for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: breakpad gyp changes Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index f882f79c005506b008d23672f7ee155c2ba352eb..621a9dd1253fa81ca0117705fd4d3a330b57454c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -613,7 +613,7 @@
'glibcxx_debug%': 0,
# Override whether we should use Breakpad on Linux. I.e. for Chrome bot.
- 'linux_breakpad%': 0,
+ 'posix_breakpad%': 0,
Mark Mentovai 2012/04/05 14:28:03 No.
carlosvaldivia 2012/04/05 18:35:56 I'll get to it. On 2012/04/05 14:28:03, Mark Ment
# And if we want to dump symbols for Breakpad-enabled builds.
'linux_dump_symbols%': 0,
# And if we want to strip the binary after dumping symbols.
@@ -731,7 +731,7 @@
'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
'conditions': [
['branding=="Chrome"', {
- 'linux_breakpad%': 1,
+ 'posix_breakpad%': 1,
}],
# All Chrome builds have breakpad symbols, but only process the
# symbols from official builds.
@@ -761,7 +761,7 @@
'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
# Uses Android's crash report system
- 'linux_breakpad%': 0,
+ 'posix_breakpad%': 0,
# Always uses openssl.
'use_openssl%': 1,
@@ -2084,9 +2084,9 @@
'ADDRESS_SANITIZER',
],
}],
- ['linux_breakpad==1', {
+ ['posix_breakpad==1', {
'cflags': [ '-g' ],
- 'defines': ['USE_LINUX_BREAKPAD'],
+ 'defines': ['USE_POSIX_BREAKPAD'],
}],
['linux_use_heapchecker==1', {
'variables': {'linux_use_tcmalloc%': 1},

Powered by Google App Engine
This is Rietveld 408576698